[Gnash-commit] gnash ChangeLog libmedia/FLVParser.cpp libmedia...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/04 11:48:50

Modified files:
        .              : ChangeLog 
        libmedia       : FLVParser.cpp FLVParser.h 

Log message:
        * libmedia/FLVParser.{cpp,h}: don't leak encoded frame info.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6799&r2=1.6800
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6799
retrieving revision 1.6800
diff -u -b -r1.6799 -r1.6800
--- ChangeLog   4 Jun 2008 11:40:46 -0000       1.6799
+++ ChangeLog   4 Jun 2008 11:48:49 -0000       1.6800
@@ -1,5 +1,9 @@
 2008-06-04 Sandro Santilli <address@hidden>
 
+       * libmedia/FLVParser.{cpp,h}: don't leak encoded frame info.
+
+2008-06-04 Sandro Santilli <address@hidden>
+
        * libmedia/ffmpeg/MediaParserFfmpeg.{cpp,h}: don't
          miss to call av_register_all, so probing works (thanks bjacques);
          LOG_ONCE for log_unimpl; don't leak ByteIO buffer;

Index: libmedia/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/FLVParser.cpp      3 Jun 2008 12:39:52 -0000       1.9
+++ libmedia/FLVParser.cpp      4 Jun 2008 11:48:50 -0000       1.10
@@ -109,9 +109,17 @@
 
 FLVParser::~FLVParser()
 {
-       _videoFrames.clear();
+       for (VideoFrames::iterator i=_videoFrames.begin(),
+               e=_videoFrames.end(); i!=e; ++i)
+       {
+               delete (*i);
+       }
 
-       _audioFrames.clear();
+       for (AudioFrames::iterator i=_audioFrames.begin(),
+               e=_audioFrames.end(); i!=e; ++i)
+       {
+               delete (*i);
+       }
 }
 
 

Index: libmedia/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/FLVParser.h        3 Jun 2008 12:39:53 -0000       1.11
+++ libmedia/FLVParser.h        4 Jun 2008 11:48:50 -0000       1.12
@@ -262,8 +262,20 @@
 
 private:
 
+       /// \brief
+       /// Get info about the audio frame to return
+       /// on nextAudioFrame() call
+       //
+       /// Returned object is owned by this class.
+       ///
        FLVAudioFrameInfo* peekNextAudioFrameInfo();
 
+       /// \brief
+       /// Get info about the video frame to return
+       /// on nextAudioFrame() call
+       //
+       /// Returned object is owned by this class.
+       ///
        FLVVideoFrameInfo* peekNextVideoFrameInfo();
 
        /// seeks to the closest possible position the given position,
@@ -286,6 +298,8 @@
        typedef std::vector<FLVVideoFrameInfo*> VideoFrames;
 
        /// list of videoframes, does no contain the frame data.
+       //
+       /// Elements owned by this class.
        VideoFrames _videoFrames;
 
        // NOTE: FLVAudioFrameInfo is a relatively small structure,
@@ -294,6 +308,8 @@
        typedef std::vector<FLVAudioFrameInfo*> AudioFrames;
 
        /// list of audioframes, does no contain the frame data.
+       //
+       /// Elements owned by this class.
        AudioFrames _audioFrames;
 
        /// The position where the parsing should continue from.