From b58ae2484128e6536a25c9ea1b73a204a9117619 Mon Sep 17 00:00:00 2001
From: "dveditz%netscape.com" <dveditz%netscape.com>
Date: Mon, 22 Nov 1999 22:32:40 +0000
Subject: [PATCH] Bug 19566 preventing PSM install. r=ssu

---
 xpinstall/src/nsInstall.cpp   |  4 ++--
 xpinstall/src/nsJSInstall.cpp | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/xpinstall/src/nsInstall.cpp b/xpinstall/src/nsInstall.cpp
index 993ced44f27d..c7e5690ef4ab 100644
--- a/xpinstall/src/nsInstall.cpp
+++ b/xpinstall/src/nsInstall.cpp
@@ -970,7 +970,7 @@ nsInstall::GetFolder(const nsString& targetFolder, const nsString& aSubdirectory
         return INVALID_ARGUMENTS;
 
     *aNewFolder = new nsInstallFolder(targetFolder, aSubdirectory);   
-    if (aNewFolder == nsnull)
+    if (*aNewFolder == nsnull)
     {
         return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -993,7 +993,7 @@ nsInstall::GetFolder( nsInstallFolder& aTargetFolderObj, const nsString& aSubdir
         return INVALID_ARGUMENTS;
   
     *aNewFolder = new nsInstallFolder(aTargetFolderObj, aSubdirectory);
-    if (aNewFolder == nsnull)
+    if (*aNewFolder == nsnull)
     {
         return NS_ERROR_OUT_OF_MEMORY;
     }
diff --git a/xpinstall/src/nsJSInstall.cpp b/xpinstall/src/nsJSInstall.cpp
index c18f0c20cf4e..5e9e7daa3856 100644
--- a/xpinstall/src/nsJSInstall.cpp
+++ b/xpinstall/src/nsJSInstall.cpp
@@ -603,7 +603,7 @@ InstallAddSubcomponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
 
     if (!JS_InstanceOf(cx, jsObj, &FileSpecObjectClass, argv))
     {
-      JS_ReportError(cx, "GetFolder:Invalid Parameter");
+      JS_ReportError(cx, "AddSubcomponent:Invalid Parameter");
       return JS_FALSE; 
     }
 
@@ -931,16 +931,14 @@ InstallGetComponentFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
   {
     //  public int GetComponentFolder ( String registryName,
     //                                  String subDirectory);
+    ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
-    if(JSVAL_IS_STRING(argv[0])) // check if the first argument is a string 
-    {
-      ConvertJSValToStr(b0, cx, argv[0]);
-      if(NS_OK != nativeThis->GetComponentFolder(b0, b1, &folder))
-        return JS_FALSE;
-    }
 
-    if(nsnull != folder)
+    if(NS_OK != nativeThis->GetComponentFolder(b0, b1, &folder))
+    {
+      // error!
       return JS_FALSE;
+    }
   }
   else if(argc >= 1)
   {
@@ -950,11 +948,9 @@ InstallGetComponentFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
 
     if(NS_OK != nativeThis->GetComponentFolder(b0, &folder))
     {
+      // error!
       return JS_FALSE;
     }
-
-    if(nsnull != folder)
-      return JS_FALSE;
   }
   else
   {
@@ -962,6 +958,10 @@ InstallGetComponentFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     return JS_FALSE;
   }
 
+  // if we couldn't find one return null rval from here
+  if(nsnull == folder)
+    return JS_TRUE;
+  
   /* Now create the new JSObject */
   JSObject* fileSpecObject;