Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging changes on MOZILLA_1_7_BRANCH between AVIARY_1_0_20040515_BASE and MOZILLA_1_7_RELEASE: bug 238712.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158089 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2004-06-18 02:36:36 +00:00
parent 62986507f0
commit bed1e474e9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
View File

@@ -1497,7 +1497,8 @@ pre_call_clean_up:
if(isArray)
{
if(!XPCConvert::JSArray2Native(ccx, (void**)&pv->val, val,
if(array_count &&
!XPCConvert::JSArray2Native(ccx, (void**)&pv->val, val,
array_count, array_count,
datum_type,
useAllocator, &param_iid,

3
mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
View File

@@ -1979,7 +1979,8 @@ XPCWrappedNative::CallMethod(XPCCallContext& ccx,
if(isArray)
{
if(!XPCConvert::JSArray2Native(ccx, (void**)&dp->val, src,
if(array_count &&
!XPCConvert::JSArray2Native(ccx, (void**)&dp->val, src,
array_count, array_capacity,
datum_type,
useAllocator,