2 files changed, 5 insertions, 1 deletions

diff --git a/src/engine/container.cpp b/src/engine/container.cpp
index 2db2412c..0cce3131 100644
--- a/src/engine/container.cpp
+++ b/src/engine/container.cpp
@@ -318,6 +318,10 @@ extern "C" HRESULT ContainerStreamToBuffer(
     case BURN_CONTAINER_TYPE_CABINET:
         hr = CabExtractStreamToBuffer(pContext, ppbBuffer, pcbBuffer);
         break;
+
+    default:
+        *ppbBuffer = NULL;
+        *pcbBuffer = 0;
     }
 
 //LExit:
diff --git a/src/engine/container.h b/src/engine/container.h
index 88fe48f1..c2c1c9a8 100644
--- a/src/engine/container.h
+++ b/src/engine/container.h
@@ -161,7 +161,7 @@ HRESULT ContainerOpen(
     __in_z LPCWSTR wzFilePath
     );
 HRESULT ContainerNextStream(
-    __inout BURN_CONTAINER_CONTEXT* pContext,
+    __in BURN_CONTAINER_CONTEXT* pContext,
     __inout_z LPWSTR* psczStreamName
     );
 HRESULT ContainerStreamToFile(