[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs]
From:       balcock () helixcommunity ! org
Date:       2011-06-23 22:52:20
Message-ID: 201106232252.p5NMqtgN024771 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mkv/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24149

Modified Files:
      Tag: hxclient_4_2_0_brizo
	mkv_file_format.cpp 
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
RealNetworks, and I am authorized to contribute this code under said agreement."

Modified by:  ext-shashi.merapala@nokia.com  

Reviewed by:  ext-dushyant.vipradas@nokia.com    

Date:  05/16/2011

Project:  symbian_client_apps

Error Id:  ou1cimx1#806933

Synopsis:  SPPR_PERF: Security: Panic"Application closed: HarvesterServer" pops up \
after inserting the MMC into the phone when the MMC includes rmvb format video files.

Overview:  The test files used are tool-generated corrupt mkv files. Several \
harvester crashes have resulted due to these files and all of them are data abort \
exceptions due to missing information.

Solution:  Changes are made in the mkv file format to check for valid data before \
using them and so preventing the crashes.

Diffs attached.
 
Files added:  None

Files modified:  /cvsroot/datatype/mkv/fileformat/mkv_file_format.cpp
                 /cvsroot/xiph/matroskalib/Matroska.cpp
                           
Image size and heap use impact:  Negligible

Module release testing (STIF):  Done. Passed.

Test case(s) added:  No  

Memory leak check performed:  NA

Platforms and profiles build verified:  helix-client-symbian-4

Platforms and profiles functionality verified:  armv5 

Branch:  420Brizo


Index: mkv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/mkv/fileformat/mkv_file_format.cpp,v
retrieving revision 1.1.1.1.2.1.2.16
retrieving revision 1.1.1.1.2.1.2.17
diff -u -d -r1.1.1.1.2.1.2.16 -r1.1.1.1.2.1.2.17
--- mkv_file_format.cpp	25 Mar 2011 19:16:33 -0000	1.1.1.1.2.1.2.16
+++ mkv_file_format.cpp	23 Jun 2011 22:52:17 -0000	1.1.1.1.2.1.2.17
@@ -431,7 +431,10 @@
 
 			// Set the mime type
 			const char* pszMimeType = NULL;
-			pszMimeType = GetMimeType(trk->pszCodec, trk->pExtraData);
+			if (trk->pszCodec && trk->pExtraData)
+			{    
+			    pszMimeType = GetMimeType(trk->pszCodec, trk->pExtraData);
+			}
 			if(pszMimeType == NULL)
 			{
 			    pszMimeType = MkvUnknownMimeType[trk->type];
@@ -441,7 +444,7 @@
 
 			SetTypeSpecificProperties(pHdr, trk);
 
-			if(trk->uExtraData > 0)
+			if ((trk->uExtraData > 0) && trk->pszCodec && trk->pExtraData)
 			{
 				// Get the opaque data buffer
 				IHXBuffer* pOpaque = NULL;


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]