Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 22:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 389856. Fix dialog argument handling. r=mrbkap@gmail.com, sr=jonas@sicking.cc

Browse Source
This commit is contained in:
jst@mozilla.org 2007-08-01 15:38:44 -07:00
parent 1cd91d7f01
commit d2f18ad63a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/src/base/nsJSEnvironment.cpp
View File

@ -2385,10 +2385,8 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg
// window.dialogArguments is supposed to be an array if a JS array
// was passed to showModalDialog(), deal with that here.
if (strcmp(aPropName, "dialogArguments") == 0 && argc == 1 &&
JSVAL_IS_OBJECT(argv[0]) &&
::JS_IsArrayObject(mContext, JSVAL_TO_OBJECT(argv[0]))) {
vargs = argv[0];
if (strcmp(aPropName, "dialogArguments") == 0 && argc <= 1) {
vargs = argc ? argv[0] : JSVAL_VOID;
} else {
JSObject *args = ::JS_NewArrayObject(mContext, argc, argv);
vargs = OBJECT_TO_JSVAL(args);
@ -2399,7 +2397,6 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg
rv = ::JS_DefineProperty(mContext, reinterpret_cast<JSObject *>(aTarget),
aPropName, vargs, nsnull, nsnull, 0) ?
NS_OK : NS_ERROR_FAILURE;
// free 'args'???
return rv;
}