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

ASIX Sigma: Improve error handling a bit.

This commit is contained in:
Uwe Hermann 2011-04-16 16:04:32 +02:00
parent 92b3101cfc
commit 12ad53f5a6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hardware/asix-sigma/asix-sigma.c
View File

@ -333,11 +333,14 @@ static int bin2bitbang(const char *filename,
if (!(compressed_buf = g_try_malloc(file_size))) { if (!(compressed_buf = g_try_malloc(file_size))) {
sr_err("asix: %s: compressed_buf malloc failed", __func__); sr_err("asix: %s: compressed_buf malloc failed", __func__);
fclose(f);
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
if (!(firmware = g_try_malloc(buffer_size))) { if (!(firmware = g_try_malloc(buffer_size))) {
sr_err("asix: %s: firmware malloc failed", __func__); sr_err("asix: %s: firmware malloc failed", __func__);
fclose(f);
g_free(compressed_buf);
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
@ -364,6 +367,8 @@ static int bin2bitbang(const char *filename,
*buf = p = (unsigned char *)g_try_malloc(*buf_size); *buf = p = (unsigned char *)g_try_malloc(*buf_size);
if (!p) { if (!p) {
sr_err("asix: %s: buf/p malloc failed", __func__); sr_err("asix: %s: buf/p malloc failed", __func__);
g_free(compressed_buf);
g_free(firmware);
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
@ -432,7 +437,7 @@ static int hw_init(const char *deviceinfo)
return 1; return 1;
free: free:
free(sigma); g_free(sigma);
return 0; return 0;
} }