Merge pull request #650 from kolen/fix-warning-options-not-initialized

robin850 · web-flow · commit e23383e4b27a · 2018-03-25T12:44:38.000+02:00
Fix "instance variable @options not initialized" warning in verbose mode
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+* Fix `warning: instance variable @options not initialized` when
+  running under verbose mode (`-w`, `$VERBOSE = true`).
+
 * Fix SmartyPants single quotes right after a link. For example:
 
   ~~~markdown
diff --git a/ext/redcarpet/rc_render.c b/ext/redcarpet/rc_render.c
@@ -390,6 +390,7 @@ static VALUE rb_redcarpet_rbase_alloc(VALUE klass)
 static void rb_redcarpet__overload(VALUE self, VALUE base_class)
 {
 	struct rb_redcarpet_rndr *rndr;
+	VALUE options_ivar;
 
 	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
 	rndr->options.self = self;
@@ -411,7 +412,8 @@ static void rb_redcarpet__overload(VALUE self, VALUE base_class)
 		}
 	}
 
-	if (rb_iv_get(self, "@options") == Qnil)
+	options_ivar = rb_attr_get(self, rb_intern("@options"));
+	if (options_ivar == Qundef || options_ivar == Qnil)
 		rb_iv_set(self, "@options", rb_hash_new());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,7 @@ static VALUE rb_redcarpet_rbase_alloc(VALUE klass)`
`390`	`390`	`static void rb_redcarpet__overload(VALUE self, VALUE base_class)`
`391`	`391`	`{`
`392`	`392`	`struct rb_redcarpet_rndr *rndr;`
	`393`	`+ VALUE options_ivar;`
`393`	`394`
`394`	`395`	`Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);`
`395`	`396`	`rndr->options.self = self;`
`@@ -411,7 +412,8 @@ static void rb_redcarpet__overload(VALUE self, VALUE base_class)`
`411`	`412`	`}`
`412`	`413`	`}`
`413`	`414`
`414`		`- if (rb_iv_get(self, "@options") == Qnil)`
	`415`	`+ options_ivar = rb_attr_get(self, rb_intern("@options"));`
	`416`	`+ if (options_ivar == Qundef \|\| options_ivar == Qnil)`
`415`	`417`	`rb_iv_set(self, "@options", rb_hash_new());`
`416`	`418`	`}`
`417`	`419`