Fixes [Bug #20718] (ruby#11576)

jcalvert · web-flow · commit 55ddfd58dd6e · 2024-09-10T17:38:48.000-07:00
Fixes [Bug #20718]

Allow objects that are not of type `RTypedData` to use the default free function, as `RTYPEDDATA_EMBEDDED_P` can return a false positive when casting non-`RTypedData` objects
diff --git a/gc.c b/gc.c
@@ -3491,7 +3491,7 @@ rb_data_free(rb_objspace_t *objspace, VALUE obj)
 
         if (dfree) {
             if (dfree == RUBY_DEFAULT_FREE) {
-                if (!RTYPEDDATA_EMBEDDED_P(obj)) {
+                if (!RTYPEDDATA_P(obj) || !RTYPEDDATA_EMBEDDED_P(obj)) {
                     xfree(data);
                     RB_DEBUG_COUNTER_INC(obj_data_xfree);
                 }

Original file line number	Diff line number	Diff line change
`@@ -3491,7 +3491,7 @@ rb_data_free(rb_objspace_t *objspace, VALUE obj)`
`3491`	`3491`
`3492`	`3492`	`if (dfree) {`
`3493`	`3493`	`if (dfree == RUBY_DEFAULT_FREE) {`
`3494`		`- if (!RTYPEDDATA_EMBEDDED_P(obj)) {`
	`3494`	`+ if (!RTYPEDDATA_P(obj) \|\| !RTYPEDDATA_EMBEDDED_P(obj)) {`
`3495`	`3495`	`xfree(data);`
`3496`	`3496`	`RB_DEBUG_COUNTER_INC(obj_data_xfree);`
`3497`	`3497`	`}`