kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 20:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Report module id as string and as double, in case of invalid values are passed to nativeRequire

Browse Source 
Differential Revision: D6695769

fbshipit-source-id: b578b9d52ed711fb5a3e51717ac555fa8a232d7a
This commit is contained in:
Alex Dvornikov
2018-01-11 14:11:00 -08:00
committed by Facebook Github Bot
parent 702b7e877e
commit 8f358a2088
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReactCommon/cxxreact/JSCUtils.cpp
View File

@@ -2,6 +2,8 @@
#include "JSCUtils.h"
#include <folly/Conv.h>
namespace facebook {
namespace react {
@@ -17,28 +19,20 @@ std::pair<uint32_t, uint32_t> parseNativeRequireParameters(
const JSGlobalContextRef& context,
const JSValueRef arguments[],
size_t argumentCount) {
double moduleId = 0, bundleId = 0;
uint32_t moduleId = 0, bundleId = 0;
// use "getNumber" & "folly::to" to throw explicitely in case of an overflow
// error during conversion
if (argumentCount == 1) {
moduleId = Value(context, arguments[0]).asNumber();
moduleId = folly::to<uint32_t>(Value(context, arguments[0]).getNumberOrThrow());
} else if (argumentCount == 2) {
moduleId = Value(context, arguments[0]).asNumber();
bundleId = Value(context, arguments[1]).asNumber();
moduleId = folly::to<uint32_t>(Value(context, arguments[0]).getNumberOrThrow());
bundleId = folly::to<uint32_t>(Value(context, arguments[1]).getNumberOrThrow());
} else {
throw std::invalid_argument("Got wrong number of args");
}
if (moduleId < 0) {
throw std::invalid_argument(folly::to<std::string>("Received invalid module ID: ",
Value(context, arguments[0]).toString().str()));
}
if (bundleId < 0) {
throw std::invalid_argument(folly::to<std::string>("Received invalid bundle ID: ",
Value(context, arguments[1]).toString().str()));
}
return std::make_pair(static_cast<uint32_t>(bundleId), static_cast<uint32_t>(moduleId));
return std::make_pair(bundleId, moduleId);
}
}