mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix OOM handling

Browse Source
This commit is contained in:
Yang Tse 2010-02-03 13:28:47 +00:00
parent 3205ac35b0
commit b77d0db59e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/rtsp.c
View File

@ -183,7 +183,7 @@ CURLcode Curl_rtsp(struct connectdata *conn, bool *done)
if(!data->state.proto.rtsp) { if(!data->state.proto.rtsp) {
/* Only allocate this struct if we don't already have it! */ /* Only allocate this struct if we don't already have it! */
rtsp = calloc(sizeof(struct RTSP), 1); rtsp = calloc(1, sizeof(struct RTSP));
if(!rtsp) if(!rtsp)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
data->state.proto.rtsp = rtsp; data->state.proto.rtsp = rtsp;
@ -532,9 +532,14 @@ CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data,
if(rtspc->rtp_buf) { if(rtspc->rtp_buf) {
/* There was some leftover data the last time. Merge buffers */ /* There was some leftover data the last time. Merge buffers */
rtspc->rtp_buf = realloc(rtspc->rtp_buf, rtspc->rtp_bufsize + *nread); char *newptr = realloc(rtspc->rtp_buf, rtspc->rtp_bufsize + *nread);
if(!rtspc->rtp_buf) if(!newptr) {
Curl_safefree(rtspc->rtp_buf);
rtspc->rtp_buf = NULL;
rtspc->rtp_bufsize = 0;
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
}
rtspc->rtp_buf = newptr;
memcpy(rtspc->rtp_buf + rtspc->rtp_bufsize, k->str, *nread); memcpy(rtspc->rtp_buf + rtspc->rtp_bufsize, k->str, *nread);
rtspc->rtp_bufsize += *nread; rtspc->rtp_bufsize += *nread;
rtp = rtspc->rtp_buf; rtp = rtspc->rtp_buf;
@ -603,8 +608,12 @@ CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data,
/* Store the incomplete RTP packet for a "rewind" */ /* Store the incomplete RTP packet for a "rewind" */
scratch = malloc(rtp_dataleft); scratch = malloc(rtp_dataleft);
if(!scratch) if(!scratch) {
Curl_safefree(rtspc->rtp_buf);
rtspc->rtp_buf = NULL;
rtspc->rtp_bufsize = 0;
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
}
memcpy(scratch, rtp, rtp_dataleft); memcpy(scratch, rtp, rtp_dataleft);
Curl_safefree(rtspc->rtp_buf); Curl_safefree(rtspc->rtp_buf);
rtspc->rtp_buf = scratch; rtspc->rtp_buf = scratch;
@ -727,6 +736,8 @@ CURLcode Curl_rtsp_parseheader(struct connectdata *conn,
/* Copy the id substring into a new buffer */ /* Copy the id substring into a new buffer */
data->set.str[STRING_RTSP_SESSION_ID] = malloc(end - start + 1); data->set.str[STRING_RTSP_SESSION_ID] = malloc(end - start + 1);
if(data->set.str[STRING_RTSP_SESSION_ID] == NULL)
return CURLE_OUT_OF_MEMORY;
memcpy(data->set.str[STRING_RTSP_SESSION_ID], start, end - start); memcpy(data->set.str[STRING_RTSP_SESSION_ID], start, end - start);
(data->set.str[STRING_RTSP_SESSION_ID])[end - start] = '\0'; (data->set.str[STRING_RTSP_SESSION_ID])[end - start] = '\0';
} }