From 33b7e8bdaf458cb7c074d9941ee09a421a98a5d4 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 1 Jul 2005 04:28:17 +0000
Subject: [PATCH] Bug 283542 OOM crash [@
 nsSanePluginInstance::GetDeviceOptions][@
 nsSanePluginInstance::GetActiveDevice] patch by b.jacques@planet.nl r=jst
 sr=jst a=asa

git-svn-id: svn://10.0.0.236/trunk@175467 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
index 3ca4ea46ea9..014634ef875 100644
--- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
+++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
@@ -1393,6 +1393,7 @@ nsSanePluginInstance::GetDeviceOptions(char ** aDeviceOptions)
     // allocate string to contain data to return to caller
     string_size = ((optdesc->size - 1) * MAX_OPT_SIZE) + 1;
     *aDeviceOptions = (char*) nsMemory::Alloc(string_size);
+    NS_ENSURE_TRUE(*aDeviceOptions, NS_ERROR_OUT_OF_MEMORY);
 
     // initialize options string
     for (int n=0; n<string_size; n++)
@@ -1598,6 +1599,7 @@ nsSanePluginInstance::GetActiveDevice(char ** aActiveDevice)
         return NS_OK;
     
     *aActiveDevice = (char*) nsMemory::Alloc(PL_strlen(mSaneDevice) + 1);
+    NS_ENSURE_TRUE(*aActiveDevice, NS_ERROR_OUT_OF_MEMORY);
     PL_strcpy(*aActiveDevice, mSaneDevice);
     
     return NS_OK;