diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-26 09:24:36 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-26 09:24:36 +0200 |
| commit | 9376c701f426cdafb75c80c67bbf1683c71301f0 (patch) | |
| tree | 4964c5d0b77f6a2d5916cf9b776cacb906c7d2b1 | |
| parent | 02cd65fff0eac590c55968509c9023b691c69245 (diff) | |
Always remember to free the extract_des internal list
The pSeq list needs to be fully free'd when extract_des returns an
error.
| -rw-r--r-- | src/sdpd-request.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/sdpd-request.c b/src/sdpd-request.c index 44d30181..c7195eaf 100644 --- a/src/sdpd-request.c +++ b/src/sdpd-request.c @@ -124,7 +124,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p if (bufsize < (int) sizeof(uint8_t)) { SDPDBG("->Unexpected end of buffer"); - return -1; + goto failed; } if (dataType == SDP_TYPE_ANY) @@ -137,11 +137,11 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p if (expectedType == SDP_TYPE_UUID) { if (dataType != SDP_UUID16 && dataType != SDP_UUID32 && dataType != SDP_UUID128) { SDPDBG("->Unexpected Data type (expected UUID_ANY)"); - return -1; + goto failed; } } else if (expectedType != SDP_TYPE_ANY && dataType != expectedType) { SDPDBG("->Unexpected Data type (expected 0x%02x)", expectedType); - return -1; + goto failed; } switch (dataType) { @@ -151,7 +151,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p bufsize -= sizeof(uint8_t); if (bufsize < (int) sizeof(uint16_t)) { SDPDBG("->Unexpected end of buffer"); - return -1; + goto failed; } pElem = malloc(sizeof(uint16_t)); @@ -166,7 +166,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p bufsize -= sizeof(uint8_t); if (bufsize < (int)sizeof(uint32_t)) { SDPDBG("->Unexpected end of buffer"); - return -1; + goto failed; } pElem = malloc(sizeof(uint32_t)); @@ -182,7 +182,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p status = sdp_uuid_extract(p, bufsize, (uuid_t *) pElem, &localSeqLength); if (status < 0) { free(pElem); - return -1; + goto failed; } seqlen += localSeqLength; p += localSeqLength; @@ -199,7 +199,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p if (seqlen == data_size) break; else if (seqlen > data_size || seqlen > len) - return -1; + goto failed; } else free(pElem); } @@ -207,6 +207,10 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p scanned += seqlen; *pDataType = dataType; return scanned; + +failed: + sdp_list_free(pSeq, free); + return -1; } static int sdp_set_cstate_pdu(sdp_buf_t *buf, sdp_cont_state_t *cstate) |