From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Thu, 25 Mar 2010 03:06:12 +0000 (+0000)
Subject: Abort on unrecognized options
X-Git-Tag: v2.4~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7173d064270a9cf21ba26f4f2fe923ce8408f5dd;p=rtmpdump

Abort on unrecognized options


git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@397 400ebc74-4327-4243-bc38-086b20814532
---

diff --git a/rtmpdump.c b/rtmpdump.c
index a5ef241..cc47033 100644
--- a/rtmpdump.c
+++ b/rtmpdump.c
@@ -1122,6 +1122,7 @@ main(int argc, char **argv)
 	  break;
 	default:
 	  RTMP_LogPrintf("unknown option: %c\n", opt);
+	  return RD_FAILED;
 	  break;
 	}
     }
diff --git a/rtmpgw.c b/rtmpgw.c
index 29cebc3..0a67c21 100644
--- a/rtmpgw.c
+++ b/rtmpgw.c
@@ -446,7 +446,11 @@ void processTCPrequest(STREAMING_SERVER * server,	// server socket and state (ou
 		  ptr += nArgLen + 1;
 		  len -= nArgLen + 1;
 
-		  ParseOption(ich, arg, &req);
+		  if (!ParseOption(ich, arg, &req))
+		    {
+		      status = "400 unrecognized option";
+		      goto filenotfound;
+		    }
 		}
 	    }
 	}
@@ -953,7 +957,7 @@ ParseOption(char opt, char *arg, RTMP_REQUEST * req)
       break;
     default:
       RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg);
-      break;
+      return false;
     }
   return true;
 }
@@ -1142,7 +1146,8 @@ main(int argc, char **argv)
 	  }
 	default:
 	  //RTMP_LogPrintf("unknown option: %c\n", opt);
-	  ParseOption(opt, optarg, &defaultRTMPRequest);
+	  if (!ParseOption(opt, optarg, &defaultRTMPRequest))
+	    return RD_FAILED;
 	  break;
 	}
     }