Changeset 302

Timestamp:

Aug 1, 2014, 2:51:42 AM (9 years ago)

Author:

roman

Message:

Safer media type extra data extraction for bad/invalid media types

Location:

trunk/DirectShowSpy

Files:

• DirectShowSpy.rc (modified) (2 diffs)
• FilterGraphHelper.h (modified) (1 diff)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)

trunk/DirectShowSpy/DirectShowSpy.rc

@@ -60 +60 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  1, 0, 0, 1515
+ FILEVERSION  1, 0, 0, 1519
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
@@ -79 +79 @@
             VALUE "CompanyName", "Roman Ryltsov"
             VALUE "FileDescription", "Alax.Info DirectShow Spy Module"
-            VALUE "FileVersion",  "1, 0, 0, 1515\0"
+            VALUE "FileVersion",  "1, 0, 0, 1519\0"
             VALUE "InternalName", "DirectShowSpy.dll"
             VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2014"

trunk/DirectShowSpy/FilterGraphHelper.h

@@ -2660 +2660 @@
                 {
                         if(!pnExtraData)
+                        {
+                                if(nExtraDataSize > pMediaType->cbFormat)
+                                        nExtraDataSize = pMediaType->cbFormat;
                                 pnExtraData = pMediaType->pbFormat + pMediaType->cbFormat - nExtraDataSize;
+                        }
+                        const SSIZE_T nExtraDataExcessSize = (pnExtraData + nExtraDataSize) - (pMediaType->pbFormat + pMediaType->cbFormat);
+                        if(nExtraDataExcessSize > 0)
+                                nExtraDataSize -= min((SIZE_T) nExtraDataExcessSize, nExtraDataSize);
                         sText += AtlFormatString(_T("  * ") _T("Extra Data: %s") _T("\r\n"), I(AtlFormatData(pnExtraData, nExtraDataSize).TrimRight()));
                 }