1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RString NULL ptr check only when RUBY_DEBUG

Browse Source 
Since edf01d4e82d8e44ee30ec41fbcb7f802bc8b8c5d, fake string treats
NULL as an empty string.
This commit is contained in:
Nobuyoshi Nakada 2023-07-24 23:57:28 +09:00
parent 1780ad3748
commit 14d1540768
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/ruby/internal/core/rstring.h
View File

@ -417,13 +417,9 @@ RSTRING_PTR(VALUE str)
{ {
char *ptr = rbimpl_rstring_getmem(str).as.heap.ptr; char *ptr = rbimpl_rstring_getmem(str).as.heap.ptr;
if (RB_UNLIKELY(! ptr)) { if (RUBY_DEBUG && RB_UNLIKELY(! ptr)) {
/* :BEWARE: @shyouhei thinks that currently, there are rooms for this /* :BEWARE: @shyouhei thinks that currently, there are rooms for this
* function to return NULL. In the 20th century that was a pointless * function to return NULL. Better check here for maximum safety.
* concern. However struct RString can hold fake strings nowadays. It
* seems no check against NULL are exercised around handling of them
* (one of such usages is located in marshal.c, which scares
* @shyouhei). Better check here for maximum safety.
* *
* Also, this is not rb_warn() because RSTRING_PTR() can be called * Also, this is not rb_warn() because RSTRING_PTR() can be called
* during GC (see what obj_info() does). rb_warn() needs to allocate * during GC (see what obj_info() does). rb_warn() needs to allocate
@ -447,7 +443,7 @@ RSTRING_END(VALUE str)
{ {
struct RString buf = rbimpl_rstring_getmem(str); struct RString buf = rbimpl_rstring_getmem(str);
if (RB_UNLIKELY(! buf.as.heap.ptr)) { if (RUBY_DEBUG && RB_UNLIKELY(! buf.as.heap.ptr)) {
/* Ditto. */ /* Ditto. */
rb_debug_rstring_null_ptr("RSTRING_END"); rb_debug_rstring_null_ptr("RSTRING_END");
} }