From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Sun, 21 Mar 2010 21:15:06 +0000 (+0000)
Subject: More fixes due to -r369
X-Git-Tag: v2.4~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e73241b0213d7c125cb9d013bd016c901229f6e;p=rtmpdump

More fixes due to -r369


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

diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
index 5c9e1fe..8adc5a5 100644
--- a/librtmp/rtmp.c
+++ b/librtmp/rtmp.c
@@ -2736,21 +2736,23 @@ RTMP_Close(RTMP *r)
 
   if (RTMP_IsConnected(r))
     {
-	  if (r->m_stream_id > 0)
-	    {
-	      if ((r->Link.protocol & RTMP_FEATURE_WRITE))
-		    SendFCUnpublish(r);
-		  SendDeleteStream(r, r->m_stream_id);
-		}
-	  if (r->m_clientID.av_val)
-	    {
-		  HTTP_Post(r, RTMPT_CLOSE, "", 1);
-		  free(r->m_clientID.av_val);
-		  r->m_clientID.av_val = NULL;
-		  r->m_clientID.av_len = 0;
-		}
-      RTMPSockBuf_Close(&r->m_sb);
+      if (r->m_stream_id > 0)
+        {
+          if ((r->Link.protocol & RTMP_FEATURE_WRITE))
+	    SendFCUnpublish(r);
+	  i = r->m_stream_id;
+	  r->m_stream_id = 0;
+	  SendDeleteStream(r, i);
+	}
+      if (r->m_clientID.av_val)
+        {
+	  HTTP_Post(r, RTMPT_CLOSE, "", 1);
+	  free(r->m_clientID.av_val);
+	  r->m_clientID.av_val = NULL;
+	  r->m_clientID.av_len = 0;
 	}
+      RTMPSockBuf_Close(&r->m_sb);
+    }
 
   r->m_stream_id = -1;
   r->m_sb.sb_socket = -1;
diff --git a/rtmpsuck.c b/rtmpsuck.c
index 048711a..23a9aec 100644
--- a/rtmpsuck.c
+++ b/rtmpsuck.c
@@ -712,7 +712,7 @@ void doServe(STREAMING_SERVER * server,	// server socket and state (our listenin
 {
   RTMPPacket pc = { 0 }, ps = { 0 };
   RTMPChunk rk = { 0 };
-  char *buf;
+  char *buf = NULL;
   unsigned int buflen = 131072;
   bool paused = false;