Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / output / text / ascii.c

diff --git a/output/text/ascii.c b/output/text/ascii.c
index d97243e6e9a169110d3c37140492784b4a961249..923cb93d88f4494509f5a9e824f4d69bc26d4df3 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -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;
        }