DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On Linux realloc(0xg00d, 0) may return NULL without being an error

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-01 03:04:29 +00:00
parent e2c3b06bda
commit a48cbb2c4c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gsm.c
View File

@ -1200,7 +1200,9 @@ static int _gsm_parse(GSM * gsm)
gsm->rd_buf_cnt -= i; gsm->rd_buf_cnt -= i;
memmove(gsm->rd_buf, &gsm->rd_buf[i], gsm->rd_buf_cnt); memmove(gsm->rd_buf, &gsm->rd_buf[i], gsm->rd_buf_cnt);
if((p = realloc(gsm->rd_buf, gsm->rd_buf_cnt)) != NULL) if((p = realloc(gsm->rd_buf, gsm->rd_buf_cnt)) != NULL)
gsm->rd_buf = p; /* we can ignore errors */ gsm->rd_buf = p; /* we can ignore errors... */
else if(gsm->rd_buf_cnt == 0)
gsm->rd_buf = NULL; /* ...except when it's not one */
i = 0; i = 0;
} }
if(gsm->mode == GSM_MODE_PDU) if(gsm->mode == GSM_MODE_PDU)
@ -1223,7 +1225,9 @@ static int _parse_pdu(GSM * gsm)
gsm->rd_buf_cnt -= i; gsm->rd_buf_cnt -= i;
memmove(gsm->rd_buf, &gsm->rd_buf[i], gsm->rd_buf_cnt); memmove(gsm->rd_buf, &gsm->rd_buf[i], gsm->rd_buf_cnt);
if((p = realloc(gsm->rd_buf, gsm->rd_buf_cnt)) != NULL) if((p = realloc(gsm->rd_buf, gsm->rd_buf_cnt)) != NULL)
gsm->rd_buf = p; /* we can ignore errors */ gsm->rd_buf = p; /* we can ignore errors... */
else if(gsm->rd_buf_cnt == 0)
gsm->rd_buf = NULL; /* ...except when it's not one */
return 0; return 0;
} }
@ -1837,7 +1841,9 @@ static gboolean _on_watch_can_write(GIOChannel * source, GIOCondition condition,
gsm->wr_buf_cnt -= cnt; gsm->wr_buf_cnt -= cnt;
memmove(gsm->wr_buf, &gsm->wr_buf[cnt], gsm->wr_buf_cnt); memmove(gsm->wr_buf, &gsm->wr_buf[cnt], gsm->wr_buf_cnt);
if((p = realloc(gsm->wr_buf, gsm->wr_buf_cnt)) != NULL) if((p = realloc(gsm->wr_buf, gsm->wr_buf_cnt)) != NULL)
gsm->wr_buf = p; /* we can ignore errors */ gsm->wr_buf = p; /* we can ignore errors... */
else if(gsm->wr_buf_cnt == 0)
gsm->wr_buf = NULL; /* ...except when it's not one */
} }
switch(status) switch(status)
{ {