Call rb_mysql_result_free_result immediately when numberOfRows == 0

kamipo · kamipo · commit 5189cfee4587 · 2016-02-14T22:26:36.000+09:00
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -911,6 +911,7 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   if (wrapper->lastRowProcessed == 0 && !wrapper->is_streaming) {
     wrapper->numberOfRows = wrapper->stmt_wrapper ? mysql_stmt_num_rows(wrapper->stmt_wrapper->stmt) : mysql_num_rows(wrapper->result);
     if (wrapper->numberOfRows == 0) {
+      rb_mysql_result_free_result(wrapper);
       wrapper->rows = rb_ary_new();
       return wrapper->rows;
     }

Original file line number	Diff line number	Diff line change
`@@ -911,6 +911,7 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {`
`911`	`911`	`if (wrapper->lastRowProcessed == 0 && !wrapper->is_streaming) {`
`912`	`912`	`wrapper->numberOfRows = wrapper->stmt_wrapper ? mysql_stmt_num_rows(wrapper->stmt_wrapper->stmt) : mysql_num_rows(wrapper->result);`
`913`	`913`	`if (wrapper->numberOfRows == 0) {`
	`914`	`+ rb_mysql_result_free_result(wrapper);`
`914`	`915`	`wrapper->rows = rb_ary_new();`
`915`	`916`	`return wrapper->rows;`
`916`	`917`	`}`