diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regparse.c | 26 |
2 files changed, 17 insertions, 14 deletions
@@ -1,3 +1,8 @@ +Tue Nov 16 00:21:20 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * 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@tsg.ne.jp> * gc.c (assign_heap_slot): fix fear of memory leak and memory diff --git a/regparse.c b/regparse.c index 2caab909e1..bf40603ddd 100644 --- a/regparse.c +++ b/regparse.c @@ -2006,7 +2006,7 @@ and_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env) { 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 @@ and_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env) 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 @@ or_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env) { 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 @@ or_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env) 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); |