Minor code review change for PPM/PFM code

walbourn · walbourn · commit 6b059bcade3b · 2024-11-05T17:13:39.000-08:00
diff --git a/Texconv/PortablePixMap.cpp b/Texconv/PortablePixMap.cpp
@@ -86,6 +86,9 @@ namespace
 
     HRESULT ReadData(_In_z_ const wchar_t* szFile, std::unique_ptr<uint8_t[]>& blob, size_t& blobSize)
     {
+        if (!szFile)
+            return E_INVALIDARG;
+
         blob.reset();
 
     #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
@@ -361,6 +364,9 @@ HRESULT __cdecl SaveToPortablePixMap(
     _In_ const Image& image,
     _In_z_ const wchar_t* szFile) noexcept
 {
+    if (!szFile)
+        return E_INVALIDARG;
+
     switch (image.format)
     {
     case DXGI_FORMAT_R8G8B8A8_UNORM:
@@ -688,6 +694,9 @@ HRESULT __cdecl SaveToPortablePixMapHDR(
     _In_ const Image& image,
     _In_z_ const wchar_t* szFile) noexcept
 {
+    if (!szFile)
+        return E_INVALIDARG;
+
     switch (image.format)
     {
     case DXGI_FORMAT_R32G32B32A32_FLOAT:

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ namespace`
`86`	`86`
`87`	`87`	`HRESULT ReadData(_In_z_ const wchar_t* szFile, std::unique_ptr<uint8_t[]>& blob, size_t& blobSize)`
`88`	`88`	`{`
	`89`	`+ if (!szFile)`
	`90`	`+ return E_INVALIDARG;`
	`91`	`+`
`89`	`92`	`blob.reset();`
`90`	`93`
`91`	`94`	`#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)`
`@@ -361,6 +364,9 @@ HRESULT __cdecl SaveToPortablePixMap(`
`361`	`364`	`_In_ const Image& image,`
`362`	`365`	`_In_z_ const wchar_t* szFile) noexcept`
`363`	`366`	`{`
	`367`	`+ if (!szFile)`
	`368`	`+ return E_INVALIDARG;`
	`369`	`+`
`364`	`370`	`switch (image.format)`
`365`	`371`	`{`
`366`	`372`	`case DXGI_FORMAT_R8G8B8A8_UNORM:`
`@@ -688,6 +694,9 @@ HRESULT __cdecl SaveToPortablePixMapHDR(`
`688`	`694`	`_In_ const Image& image,`
`689`	`695`	`_In_z_ const wchar_t* szFile) noexcept`
`690`	`696`	`{`
	`697`	`+ if (!szFile)`
	`698`	`+ return E_INVALIDARG;`
	`699`	`+`
`691`	`700`	`switch (image.format)`
`692`	`701`	`{`
`693`	`702`	`case DXGI_FORMAT_R32G32B32A32_FLOAT:`