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

List:       helix-filesystem-dev
Subject:    [Filesystem-dev] CR: Changes to fix a crash issue when generate
From:       Caijun Song <scaijun () real ! com>
Date:       2010-10-28 7:45:13
Message-ID: 0A38300C49BA495B8A5CA6510161B0FB () realscaijun
[Download RAW message or body]

Synopsis: Changes to fix a crash issue when generate thumbnail for mkv file

Overview: Helix will crash when generate thumbnail for mkv file, this is
because mkv file format use CSimpleFileObject::InitSync during
InitFileFormat. InitSync will set m_pDataFile to NULL if file access mode
changed, which is wrong because we have a logic like HX_ASSERT(m_pDataFile)
after that. This is not a problem in normal playback case because file
access mode won't change when this function get called. This change avoids
setting m_pDataFile to NULL in InitSync just like CSimpleFileObject::Init
does.


Files Added:
None

Files Modified:
filesystem/local/full/smplfsys.cpp

Platforms and Profiles Functionality verified:
System: android-2.2-arm-qsd_8650a
Profile: helix-client-android-full
Target: android_omx
Branch: hxclient_3_6_2_atlas

Branch Affected: 
hxclient_3_1_0_atlas hxclient_3_6_1_atlas hxclient_3_6_2_atlas

Copyright assignment: I am a RealNetworks employee


Regards.
Caijun

["smplfsys.cpp.diff" (application/octet-stream)]

Index: smplfsys.cpp
===================================================================
RCS file: /cvsroot/filesystem/local/full/smplfsys.cpp,v
retrieving revision 1.46.2.6.2.1
diff -u -w -r1.46.2.6.2.1 smplfsys.cpp
--- smplfsys.cpp	26 Jul 2010 09:54:31 -0000	1.46.2.6.2.1
+++ smplfsys.cpp	28 Oct 2010 07:24:19 -0000
@@ -3985,8 +3985,13 @@
         else // Access mode has changed
         {
             //fclose(m_pDataFile);
+            if (m_pDescriptorReg)
+            {
+                m_pDescriptorReg->UnRegisterDescriptors(1);
+            }
+
             m_pDataFile->Close();
-            m_pDataFile = NULL;
+            m_nFd = -1;
         }
     }
     m_ulFlags = fileAccessMode;


_______________________________________________
Filesystem-dev mailing list
Filesystem-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/filesystem-dev


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