generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RTSP: catch attempted unsupported requests better

Browse Source 
Replace use of assert with code that properly catches bad input at
run-time even in non-debug builds.

This flaw was sort of detected by Coverity CID 1299425 which claimed the
"case RTSPREQ_NONE" was dead code.
This commit is contained in:
Daniel Stenberg
2015-05-22 16:32:42 +02:00
parent 03e2a9b023
commit fda0e74c22
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rtsp.c
View File

@@ -263,11 +263,10 @@ static CURLcode rtsp_do(struct connectdata *conn, bool *done)
* Since all RTSP requests are included here, there is no need to * Since all RTSP requests are included here, there is no need to
* support custom requests like HTTP. * support custom requests like HTTP.
**/ **/
DEBUGASSERT((rtspreq > RTSPREQ_NONE && rtspreq < RTSPREQ_LAST));
data->set.opt_no_body = TRUE; /* most requests don't contain a body */ data->set.opt_no_body = TRUE; /* most requests don't contain a body */
switch(rtspreq) { switch(rtspreq) {
case RTSPREQ_NONE: default:
failf(data, "Got invalid RTSP request: RTSPREQ_NONE"); failf(data, "Got invalid RTSP request");
return CURLE_BAD_FUNCTION_ARGUMENT; return CURLE_BAD_FUNCTION_ARGUMENT;
case RTSPREQ_OPTIONS: case RTSPREQ_OPTIONS:
p_request = "OPTIONS"; p_request = "OPTIONS";