kotovalexarian-likes-github/mini_racer
1
0
Fork 0
mirror of https://github.com/rubyjs/mini_racer synced 2023-03-27 23:21:28 -04:00
Code Releases Activity

replace (int)RSTRING_LEN(...) with RSTRING_LENINT(...)

Browse source 
Casting the result of RSTRING_LEN on 64-bit long systems with 32-bit
ints can lead to truncation errors when dealing with gigantic strings.
RSTRING_LENINT was introduced in Ruby 1.9.2 to avoid this problem, so
make use of it.  It's used by by several standard extensions (openssl,
zlib) and expected to remain part of the supported Ruby C API.
This commit is contained in:
Sam Saffron 2022-01-17 10:48:18 +11:00
parent 289587a087
commit 7bf8b670c7
No known key found for this signature in database
GPG key ID: B9606168D2FFD9F5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/mini_racer_extension/mini_racer_extension.cc
View file

@ -346,7 +346,7 @@ static VALUE rb_platform_set_flag_as_str(VALUE _klass, VALUE flag_as_str) {
if (!strcmp(RSTRING_PTR(flag_as_str), "--single_threaded")) { if (!strcmp(RSTRING_PTR(flag_as_str), "--single_threaded")) {
single_threaded = true; single_threaded = true;
} }
V8::SetFlagsFromString(RSTRING_PTR(flag_as_str), (int)RSTRING_LEN(flag_as_str)); V8::SetFlagsFromString(RSTRING_PTR(flag_as_str), RSTRING_LENINT(flag_as_str));
} else { } else {
platform_already_initialized = true; platform_already_initialized = true;
} }
@ -724,7 +724,7 @@ static Local<Value> convert_ruby_to_v8(Isolate* isolate, Local<Context> context,
case T_FLOAT: case T_FLOAT:
return scope.Escape(Number::New(isolate, NUM2DBL(value))); return scope.Escape(Number::New(isolate, NUM2DBL(value)));
case T_STRING: case T_STRING:
return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked()); return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, RSTRING_LENINT(value)).ToLocalChecked());
case T_NIL: case T_NIL:
return scope.Escape(Null(isolate)); return scope.Escape(Null(isolate));
case T_TRUE: case T_TRUE:
@ -752,7 +752,7 @@ static Local<Value> convert_ruby_to_v8(Isolate* isolate, Local<Context> context,
return scope.Escape(object); return scope.Escape(object);
case T_SYMBOL: case T_SYMBOL:
value = rb_funcall(value, rb_intern("to_s"), 0); value = rb_funcall(value, rb_intern("to_s"), 0);
return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked()); return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, RSTRING_LENINT(value)).ToLocalChecked());
case T_DATA: case T_DATA:
klass = rb_funcall(value, rb_intern("class"), 0); klass = rb_funcall(value, rb_intern("class"), 0);
if (klass == rb_cTime || klass == rb_cDateTime) if (klass == rb_cTime || klass == rb_cDateTime)
@ -1164,13 +1164,13 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
HandleScope handle_scope(isolate); HandleScope handle_scope(isolate);
Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(str), Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(str),
NewStringType::kNormal, (int)RSTRING_LEN(str)).ToLocalChecked(); NewStringType::kNormal, RSTRING_LENINT(str)).ToLocalChecked();
Local<String> local_filename; Local<String> local_filename;
if (filename != Qnil) { if (filename != Qnil) {
local_filename = String::NewFromUtf8(isolate, RSTRING_PTR(filename), local_filename = String::NewFromUtf8(isolate, RSTRING_PTR(filename),
NewStringType::kNormal, (int)RSTRING_LEN(filename)).ToLocalChecked(); NewStringType::kNormal, RSTRING_LENINT(filename)).ToLocalChecked();
eval_params.filename = &local_filename; eval_params.filename = &local_filename;
} else { } else {
eval_params.filename = NULL; eval_params.filename = NULL;
@ -1356,7 +1356,7 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
Local<String> v8_str = Local<String> v8_str =
String::NewFromUtf8(isolate, RSTRING_PTR(name), String::NewFromUtf8(isolate, RSTRING_PTR(name),
NewStringType::kNormal, (int)RSTRING_LEN(name)) NewStringType::kNormal, RSTRING_LENINT(name))
.ToLocalChecked(); .ToLocalChecked();
// Note that self (rb_cExternalFunction) is a pure Ruby T_OBJECT, // Note that self (rb_cExternalFunction) is a pure Ruby T_OBJECT,
@ -1376,7 +1376,7 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
Local<String> eval = Local<String> eval =
String::NewFromUtf8(isolate, RSTRING_PTR(parent_object_eval), String::NewFromUtf8(isolate, RSTRING_PTR(parent_object_eval),
NewStringType::kNormal, NewStringType::kNormal,
(int)RSTRING_LEN(parent_object_eval)) RSTRING_LENINT(parent_object_eval))
.ToLocalChecked(); .ToLocalChecked();
MaybeLocal<Script> parsed_script = Script::Compile(context, eval); MaybeLocal<Script> parsed_script = Script::Compile(context, eval);