mame	2010-11-16 01:06:35 +0900 (Tue, 16 Nov 2010)

  New Revision: 29803

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29803

  Log:
    * regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
      found this bug.  [ruby-dev:42579]

  Modified files:
    trunk/ChangeLog
    trunk/regparse.c

Index: regparse.c
===================================================================
--- regparse.c	(revision 29802)
+++ regparse.c	(revision 29803)
@@ -2006,7 +2006,7 @@
 {
   OnigEncoding enc = env->enc;
   int r, not1, not2;
-  BBuf *buf1, *buf2, *pbuf;
+  BBuf *buf1, *buf2, *pbuf = 0;
   BitSetRef bsr1, bsr2;
   BitSet bs1, bs2;
 
@@ -2041,17 +2041,16 @@
     else {
       r = and_code_range_buf(buf1, not1, buf2, not2, &pbuf, env);
       if (r == 0 && not1 != 0) {
-	BBuf *tbuf;
+	BBuf *tbuf = 0;
 	r = not_code_range_buf(enc, pbuf, &tbuf, env);
-	if (r != 0) {
-	  bbuf_free(pbuf);
-	  return r;
-	}
 	bbuf_free(pbuf);
 	pbuf = tbuf;
       }
     }
-    if (r != 0) return r;
+    if (r != 0) {
+	bbuf_free(pbuf);
+	return r;
+    }
 
     dest->mbuf = pbuf;
     bbuf_free(buf1);
@@ -2065,7 +2064,7 @@
 {
   OnigEncoding enc = env->enc;
   int r, not1, not2;
-  BBuf *buf1, *buf2, *pbuf;
+  BBuf *buf1, *buf2, *pbuf = 0;
   BitSetRef bsr1, bsr2;
   BitSet bs1, bs2;
 
@@ -2100,17 +2099,16 @@
     else {
       r = or_code_range_buf(enc, buf1, not1, buf2, not2, &pbuf, env);
       if (r == 0 && not1 != 0) {
-	BBuf *tbuf;
+	BBuf *tbuf = 0;
 	r = not_code_range_buf(enc, pbuf, &tbuf, env);
-	if (r != 0) {
-	  bbuf_free(pbuf);
-	  return r;
-	}
 	bbuf_free(pbuf);
 	pbuf = tbuf;
       }
     }
-    if (r != 0) return r;
+    if (r != 0) {
+	bbuf_free(pbuf);
+	return r;
+    }
 
     dest->mbuf = pbuf;
     bbuf_free(buf1);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29802)
+++ ChangeLog	(revision 29803)
@@ -1,3 +1,8 @@
+Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@t...>
+
+	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
+	  found this bug.  [ruby-dev:42579]
+
 Tue Nov 16 00:07:32 2010  Yusuke Endoh  <mame@t...>
 
 	* gc.c (assign_heap_slot): fix fear of memory leak and memory

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/