[rtmpdump] r221 - in tags/rel-2.1c: . amf.c rtmpdump.c rtmpsrv.c

[hyc]

Author: hyc
Date: Sat Jan  9 03:32:42 2010
New Revision: 221

Log:
Sync with trunk again

Modified:
   tags/rel-2.1c/   (props changed)
   tags/rel-2.1c/amf.c
   tags/rel-2.1c/rtmpdump.c
   tags/rel-2.1c/rtmpsrv.c

Modified: tags/rel-2.1c/amf.c
==============================================================================
--- tags/rel-2.1c/amf.c	Sat Jan  9 03:31:17 2010	(r220)
+++ tags/rel-2.1c/amf.c	Sat Jan  9 03:32:42 2010	(r221)
@@ -1038,12 +1038,12 @@ AMF_Decode(AMFObject * obj, const char *
 
   obj->o_num = 0;
   obj->o_props = NULL;
-  while (nSize >= 3)
+  while (nSize > 0)
     {
       AMFObjectProperty prop;
       int nRes;
 
-      if (AMF_DecodeInt24(pBuffer) == AMF_OBJECT_END)
+      if (nSize >=3 && AMF_DecodeInt24(pBuffer) == AMF_OBJECT_END)
 	{
 	  nSize -= 3;
 	  bError = false;

Modified: tags/rel-2.1c/rtmpdump.c
==============================================================================
--- tags/rel-2.1c/rtmpdump.c	Sat Jan  9 03:31:17 2010	(r220)
+++ tags/rel-2.1c/rtmpdump.c	Sat Jan  9 03:32:42 2010	(r221)
@@ -1368,7 +1368,7 @@ main(int argc, char **argv)
 	      {
 		swfHash.av_val = NULL;
 		Log(LOGWARNING,
-		    "Couldn't parse swf hash hex string, not heyxstring or not %d bytes, ignoring!", HASHLEN);
+		    "Couldn't parse swf hash hex string, not hexstring or not %d bytes, ignoring!", HASHLEN);
 	      }
 	    swfHash.av_len = HASHLEN;
 	    break;

Modified: tags/rel-2.1c/rtmpsrv.c
==============================================================================
--- tags/rel-2.1c/rtmpsrv.c	Sat Jan  9 03:31:17 2010	(r220)
+++ tags/rel-2.1c/rtmpsrv.c	Sat Jan  9 03:32:42 2010	(r221)
@@ -279,6 +279,7 @@ dumpAMF(AMFObject *obj)
          }
     }
 }
+
 // Returns 0 for OK/Failed/error, 1 for 'Stop or Complete'
 int
 ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int offset)
@@ -394,24 +395,24 @@ ServeInvoke(STREAMING_SERVER *server, RT
         r->Link.length = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 5));
       if (r->Link.tcUrl.av_len)
         {
-          LogPrintf("\nrtmpdump -r '%s'", r->Link.tcUrl.av_val);
+          LogPrintf("\nrtmpdump -r \"%s\"", r->Link.tcUrl.av_val);
           if (r->Link.app.av_val)
-            LogPrintf(" -a '%s'", r->Link.app.av_val);
+            LogPrintf(" -a \"%s\"", r->Link.app.av_val);
           if (r->Link.flashVer.av_val)
-            LogPrintf(" -f '%s'", r->Link.flashVer.av_val);
+            LogPrintf(" -f \"%s\"", r->Link.flashVer.av_val);
           if (r->Link.swfUrl.av_val)
-            LogPrintf(" -W '%s'", r->Link.swfUrl.av_val);
-          LogPrintf(" -t '%s'", r->Link.tcUrl.av_val);
+            LogPrintf(" -W \"%s\"", r->Link.swfUrl.av_val);
+          LogPrintf(" -t \"%s\"", r->Link.tcUrl.av_val);
           if (r->Link.pageUrl.av_val)
-            LogPrintf(" -p '%s'", r->Link.pageUrl.av_val);
+            LogPrintf(" -p \"%s\"", r->Link.pageUrl.av_val);
           if (r->Link.auth.av_val)
-            LogPrintf(" -u '%s'", r->Link.auth.av_val);
+            LogPrintf(" -u \"%s\"", r->Link.auth.av_val);
           if (r->Link.extras.o_num)
             {
               dumpAMF(&r->Link.extras);
               AMF_Reset(&r->Link.extras);
             }
-          LogPrintf(" -y '%.*s' -o output.flv\n\n",
+          LogPrintf(" -y \"%.*s\" -o output.flv\n\n",
             r->Link.playpath.av_len, r->Link.playpath.av_val);
         }
       pc.m_body = server->connect;