diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-03 02:25:37 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-03 02:25:37 +0000 |
commit | ce2bc45ae8679b40e97d6794e4e7a31b68444615 (patch) | |
tree | b48256dafb55153e121aa5a8ae04e1711b373413 /ext/etc | |
parent | 05ba99388d1133a99153044be67d7ae3b3dc4de5 (diff) |
merge revision(s) 60042,60130,60131: [Backport #13982]
ext: adjust indent [ci skip]
zlib.c: memory leak in gunzip
* ext/zlib/zlib.c (zlib_gunzip): clear zstream to fix memory leak.
[ruby-core:83162] [Bug #13982]
zlib.c: ensure to free
* ext/zlib/zlib.c (zlib_gunzip): gz0 is a structure variable on
the stack, no longer valid after exit by an exception. ensure
to free instead. [Bug #13982]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/etc')
-rw-r--r-- | ext/etc/etc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index f871d9c2ae..46857c62c7 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -1014,7 +1014,7 @@ etc_nprocessors(VALUE obj) ncpus = etc_nprocessors_affin(); if (ncpus != -1) { - return INT2NUM(ncpus); + return INT2NUM(ncpus); } /* fallback to _SC_NPROCESSORS_ONLN */ #endif |