From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 22 May 2015 14:32:42 +0000 (+0200)
Subject: RTSP: catch attempted unsupported requests better
X-Git-Tag: curl-7_43_0~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fda0e74c226b75a1379f43c46a0e0de4297eb9fc;p=curl

RTSP: catch attempted unsupported requests better

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.
---

diff --git a/lib/rtsp.c b/lib/rtsp.c
index b133e205f..c5ca75723 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -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
    * 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 */
   switch(rtspreq) {
-  case RTSPREQ_NONE:
-    failf(data, "Got invalid RTSP request: RTSPREQ_NONE");
+  default:
+    failf(data, "Got invalid RTSP request");
     return CURLE_BAD_FUNCTION_ARGUMENT;
   case RTSPREQ_OPTIONS:
     p_request = "OPTIONS";