[FFmpeg-cvslog] Fix memory corruption in case of memory allocation failure in av_probe_input_buffer ()

[Michael Niedermayer]

ffmpeg | branch: oldabi | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 27 21:24:13 2011 +0200| [aedef891fc81e22685ad0bed97f50095429fc671] | committer: Michael Niedermayer

Fix memory corruption in case of memory allocation failure in av_probe_input_buffer()

Reported-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 941bb552c6e08b40eb7d7842df19285cd650edd0)

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

 libavformat/utils.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8dd76f3..1a50c8c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -596,13 +596,19 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
         probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
         int score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0;
         int buf_offset = (probe_size == PROBE_BUF_MIN) ? 0 : probe_size>>1;
+        void *buftmp;
 
         if (probe_size < offset) {
             continue;
         }
 
         /* read probe data */
-        buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
+        buftmp = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
+        if(!buftmp){
+            av_free(buf);
+            return AVERROR(ENOMEM);
+        }
+        buf=buftmp;
         if ((ret = avio_read(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
             /* fail if error was not end of file, otherwise, lower score */
             if (ret != AVERROR_EOF) {