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

MSO19: Always use glib's memory allocation functions.

This commit is contained in:
Uwe Hermann 2011-04-17 10:22:10 +02:00
parent 27a3a6fe4b
commit ecad043fd0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hardware/link-mso19/link-mso19.c
View File

@ -86,12 +86,16 @@ static int mso_send_control_message(struct sr_device_instance *sdi,
int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot); int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot);
char *p, *buf; char *p, *buf;
ret = SR_ERR;
if (fd < 0) if (fd < 0)
goto ret; goto ret;
buf = malloc(s); if (!(buf = g_try_malloc(s))) {
if (!buf) sr_err("mso19: %s: buf malloc failed", __func__);
ret = SR_ERR_MALLOC;
goto ret; goto ret;
}
p = buf; p = buf;
memcpy(p, mso_head, sizeof(mso_head)); memcpy(p, mso_head, sizeof(mso_head));
@ -114,7 +118,7 @@ static int mso_send_control_message(struct sr_device_instance *sdi,
} }
ret = SR_OK; ret = SR_OK;
free: free:
free(buf); g_free(buf);
ret: ret:
return ret; return ret;
} }
@ -433,10 +437,10 @@ static int hw_init(const char *deviceinfo)
strcpy(manufacturer, iProduct + s); strcpy(manufacturer, iProduct + s);
sprintf(hwrev, "r%d", mso->hwrev); sprintf(hwrev, "r%d", mso->hwrev);
mso = malloc(sizeof(struct mso)); if (!(mso = g_try_malloc0(sizeof(struct mso)))) {
if (!mso) sr_err("mso19: %s: mso malloc failed", __func__);
continue; continue; /* TODO: Errors handled correctly? */
memset(mso, 0, sizeof(struct mso)); }
if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) { if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) {
sr_warn("Invalid iSerial: %s", iSerial); sr_warn("Invalid iSerial: %s", iSerial);