[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderFfmpeg... [release-0-8-0]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Sandro Santilli <strk>  07/06/09 12:46:33

Modified files:
        .              : ChangeLog 
        libbase        : embedVideoDecoderFfmpeg.cpp 

Log message:
                * libbase/embedVideoDecoderFfmpeg.cpp (decodeFrame): do not
                  access a null decodedFrame (tgc: please check).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.54&r2=1.3451.2.55
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.13.4.5&r2=1.13.4.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.54
retrieving revision 1.3451.2.55
diff -u -b -r1.3451.2.54 -r1.3451.2.55
--- ChangeLog   9 Jun 2007 01:26:51 -0000       1.3451.2.54
+++ ChangeLog   9 Jun 2007 12:46:32 -0000       1.3451.2.55
@@ -1,3 +1,8 @@
+2007-06-09 Sandro Santilli <address@hidden>
+
+       * libbase/embedVideoDecoderFfmpeg.cpp (decodeFrame): do not
+         access a null decodedFrame (tgc: please check).
+
 2007-06-08  Rob Savoye  <address@hidden>
 
        * configure.ac: Set version to 0.8.0.

Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.13.4.5
retrieving revision 1.13.4.6
diff -u -b -r1.13.4.5 -r1.13.4.6
--- libbase/embedVideoDecoderFfmpeg.cpp 8 Jun 2007 21:54:38 -0000       1.13.4.5
+++ libbase/embedVideoDecoderFfmpeg.cpp 9 Jun 2007 12:46:33 -0000       1.13.4.6
@@ -160,7 +160,16 @@
 
        // If there is nothing to decode in the new frame
        // we just return the lastest.
-       if (data == NULL || codec == NULL || size == 0) {
+       if (data == NULL || codec == NULL || size == 0)
+       {
+               // If haven't decoded any frame yet, return
+               // the null pointer.
+               if ( ! decodedFrame.get() )
+               {
+                       ret_image.reset(NULL);
+                       return ret_image;
+               }
+
                ret_image->update(decodedFrame->m_data);
                return ret_image;
        }
@@ -241,6 +250,13 @@
        }
 
        av_free(frame);
+       // If haven't decoded any frame yet, return
+       // the null pointer.
+       if ( ! decodedFrame.get() )
+       {
+               ret_image.reset(NULL);
+               return ret_image;
+       }
        ret_image->update(decodedFrame->m_data);
        return ret_image;
 }