Modified by: rachit.gupta at sasken.com<mailto:rachit.gupta at sasken.com>
Reviewed by: ext-dongsung.kim at nokia.com<mailto:ext-dongsung.kim at nokia.com>
RC Id: ou1cimx1#943762
Date: 12/06/2011
Project: SymbianMmf_wm
Synopsis: Corrupt MKV format clips causing harvester and thumbnail crashes
Overview: There are harvester and thumbnail crashes from corrupt files when harvester scans all media files.
Fix: In the destructor of MatroskaSegment, FlushQ() is called after the m_Tracks have been deleted. This causes invalid access of pointers.
Files modified & changes:
/​ext/​mw/​helixext/​helix_ren/​src/​datatype/​mkv/libmatroska/Matroska.cpp
Image Size and Heap Use impact: No impact
Module Release testing (STIF) : Passed.
Test case(s) Added : No
Memory leak check performed : N/A
Platforms and Profiles Functionality verified: armv5
MCL Branch: 420 brizo
Diff:
Index: Matroska.cpp
===================================================================
RCS file: /cvsroot/xiph/matroskalib/Matroska.cpp,v
retrieving revision 1.1.1.1.2.1.2.19
diff -u -w -r1.1.1.1.2.1.2.19 Matroska.cpp
--- Matroska.cpp 22 Aug 2011 15:51:08 -0000 1.1.1.1.2.1.2.19
+++ Matroska.cpp 6 Dec 2011 08:59:08 -0000
@@ -68,7 +68,9 @@
  {
   free( m_Tracks[iTrack]->pExtraData );
   free( m_Tracks[iTrack]->pszCodec );
+  m_Tracks[iTrack]->FlushQ();
   delete m_Tracks[iTrack];
+  m_Tracks[iTrack] = NULL;
  }

  if(m_pSegTitle)
@@ -111,7 +113,6 @@
      delete m_pSegment;
      m_pSegment = NULL;
  }
- FlushQ();
  ClearCues();

  delete m_pES;

________________________________
SASKEN BUSINESS DISCLAIMER: This message may contain confidential, proprietary or legally privileged information. In case you are not the original intended Recipient of the message, you must not, directly or indirectly, use, disclose, distribute, print, or copy any part of this message and you are requested to delete it and inform the sender. Any views expressed in this message are those of the individual sender unless otherwise stated. Nothing contained in this message shall be construed as an offer or acceptance of any offer by Sasken Communication Technologies Limited ("Sasken") unless sent with that express intent and with due authority of Sasken. Sasken has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email.
Read Disclaimer at http://www.sasken.com/extras/mail_disclaimer.html
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20111206/6e0c84a1/attachment-0001.html