X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=1f7064c8363fa93b17007788a4299f8a7e41de62;hb=f92994fd9174bc423e58c21eda83633afc9513da;hp=d97243e6e9a169110d3c37140492784b4a961249;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index d97243e6..1f7064c8 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 HÃ¥vard Espeland <gus@ping.uio.no>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -50,14 +50,16 @@ SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
 	outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
             * (ctx->num_enabled_probes * max_linelen);
 
-	if (!(outbuf = calloc(1, outsize + 1)))
+	if (!(outbuf = g_try_malloc0(outsize + 1))) {
+		sr_err("ascii out: %s: outbuf malloc failed", __func__);
 		return SR_ERR_MALLOC;
+	}
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
 		strncpy(outbuf, ctx->header, outsize);
-		free(ctx->header);
+		g_free(ctx->header);
 		ctx->header = NULL;
 	}
 
@@ -106,7 +108,8 @@ SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
 			ctx->prevsample = sample;
 		}
 	} else {
-		sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("ascii out: short buffer (length_in=%" PRIu64 ")",
+			length_in);
 	}
 
 	*data_out = outbuf;