BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input: sr_input_new() always allocates the instance buffer.

This commit is contained in:
Bert Vermeulen 2014-08-19 00:09:09 +02:00
parent fe4fe25bf5
commit 57486a7528
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/input.c
View File

@ -270,12 +270,12 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
} }
if (in->module->init && in->module->init(in, new_opts) != SR_OK) { if (in->module->init && in->module->init(in, new_opts) != SR_OK) {
g_hash_table_destroy(new_opts);
g_free(in); g_free(in);
in = NULL; in = NULL;
} }
if (new_opts) if (new_opts)
g_hash_table_destroy(new_opts); g_hash_table_destroy(new_opts);
in->buf = g_string_sized_new(128);
return in; return in;
} }
@ -357,7 +357,7 @@ SR_API const struct sr_input *sr_input_scan_buffer(GString *buf)
/* Found a matching module. */ /* Found a matching module. */
in = sr_input_new(imod, NULL); in = sr_input_new(imod, NULL);
in->buf = g_string_new_len(buf->str, buf->len); g_string_insert_len(in->buf, 0, buf->str, buf->len);
break; break;
} }
@ -456,7 +456,7 @@ SR_API const struct sr_input *sr_input_scan_file(const char *filename)
/* Found a matching module. */ /* Found a matching module. */
in = sr_input_new(imod, NULL); in = sr_input_new(imod, NULL);
in->buf = g_string_new_len(buf->str, buf->len); g_string_insert_len(in->buf, 0, buf->str, buf->len);
break; break;
} }
if (!in && buf) if (!in && buf)