From bed1e474e9552c048202c12b804ae9ec36e3aa67 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Fri, 18 Jun 2004 02:36:36 +0000 Subject: [PATCH] Merging changes on MOZILLA_1_7_BRANCH between AVIARY_1_0_20040515_BASE and MOZILLA_1_7_RELEASE: bug 238712. git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158089 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp | 3 ++- mozilla/js/src/xpconnect/src/xpcwrappednative.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp index ee0c764505f..964dd9ee994 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp @@ -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, ¶m_iid, diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp index cb249fa0a2d..fb4a1d225d4 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp @@ -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,