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

Don't check g_free() arguments for NULL. 

The g_free() call is guaranteed to not segfault when NULL is passed.
This commit is contained in:
Uwe Hermann 2015-03-27 08:39:49 +01:00
parent e742b88f9a
commit b1f8310376
9 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend.c
View File

@ -418,8 +418,7 @@ SR_API int sr_init(struct sr_context **ctx)
ret = SR_OK; ret = SR_OK;
done: done:
if (context) g_free(context);
g_free(context);
return ret; return ret;
} }

3
src/hardware/gmc-mh-1x-2x/api.c
View File

@ -345,8 +345,7 @@ exit_err:
if (serial) if (serial)
sr_serial_dev_inst_free(serial); sr_serial_dev_inst_free(serial);
if (devc) g_free(devc);
g_free(devc);
if (sdi) if (sdi)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);

3
src/hardware/hameg-hmo/api.c
View File

@ -109,8 +109,7 @@ fail:
sr_scpi_hw_info_free(hw_info); sr_scpi_hw_info_free(hw_info);
if (sdi) if (sdi)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
if (devc) g_free(devc);
g_free(devc);
return NULL; return NULL;
} }

3
src/hardware/hameg-hmo/protocol.c
View File

@ -690,8 +690,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
break; break;
case SR_CHANNEL_LOGIC: case SR_CHANNEL_LOGIC:
if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) { if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) {
if (data) g_free(data);
g_free(data);
return TRUE; return TRUE;
} }

4
src/hardware/manson-hcs-3xxx/api.c
View File

@ -197,8 +197,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
exit_err: exit_err:
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
if (devc) g_free(devc);
g_free(devc);
return NULL; return NULL;
} }

3
src/hardware/motech-lps-30x/api.c
View File

@ -501,8 +501,7 @@ exit_err:
serial_close(serial); serial_close(serial);
sr_serial_dev_inst_free(serial); sr_serial_dev_inst_free(serial);
} }
if (devc) g_free(devc);
g_free(devc);
if (sdi) if (sdi)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);

3
src/hardware/yokogawa-dlm/api.c
View File

@ -97,8 +97,7 @@ fail:
sr_scpi_hw_info_free(hw_info); sr_scpi_hw_info_free(hw_info);
if (sdi) if (sdi)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
if (devc) g_free(devc);
g_free(devc);
return NULL; return NULL;
} }

1
src/hardware/yokogawa-dlm/protocol_wrappers.c
View File

@ -92,6 +92,7 @@ int dlm_trigger_slope_get(struct sr_scpi_dev_inst *scpi,
} }
g_free(resp); g_free(resp);
return result; return result;
} }

7
src/input/csv.c
View File

@ -777,11 +777,8 @@ static void cleanup(struct sr_input *in)
if (inc->comment) if (inc->comment)
g_string_free(inc->comment, TRUE); g_string_free(inc->comment, TRUE);
if (inc->termination) g_free(inc->termination);
g_free(inc->termination); g_free(inc->sample_buffer);
if (inc->sample_buffer)
g_free(inc->sample_buffer);
} }
static struct sr_option options[] = { static struct sr_option options[] = {