Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 19566 preventing PSM install. r=ssu

Browse Source
This commit is contained in:
dveditz%netscape.com 1999-11-22 22:32:40 +00:00
parent 76ad965c84
commit b58ae24841
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpinstall/src/nsInstall.cpp
View File

@ -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;
}

22
xpinstall/src/nsJSInstall.cpp
View File

@ -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;