[FFmpeg-cvslog] ffserver: initialize pbuffer in prepare_sdp_description()

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  2 14:03:30 2014 +0200| [150ae7692efc5890b944699534904af378c06711] | committer: Michael Niedermayer

ffserver: initialize pbuffer in prepare_sdp_description()

also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1d8d21b90ab91aa471f369e0f9d1ea20fb40733b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=150ae7692efc5890b944699534904af378c06711
---

 ffserver.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffserver.c b/ffserver.c
index 5ecdb08..44f843e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2972,6 +2972,8 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
     int i;
 
+    *pbuffer = NULL;
+
     avc =  avformat_alloc_context();
     if (avc == NULL || !rtp_format) {
         return -1;
@@ -3008,7 +3010,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
     av_free(avc);
     av_free(avs);
 
-    return strlen(*pbuffer);
+    return *pbuffer ? strlen(*pbuffer) : AVERROR(ENOMEM);
 }
 
 static void rtsp_cmd_options(HTTPContext *c, const char *url)