diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2014-03-16 23:22:22 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2014-03-16 23:22:22 -0300 |
| commit | f84997c7e6687548d0d92631dceb125f89e55a2b (patch) | |
| tree | ffff57c6a8a9ef587ee15537417ede4eecfcb639 /src | |
| parent | 8976360ea69389af5bc536abf1335a97c39c78b6 (diff) | |
| download | postgresql-f84997c7e6687548d0d92631dceb125f89e55a2b.tar.gz postgresql-f84997c7e6687548d0d92631dceb125f89e55a2b.zip | |
plperl: Fix memory leak in hek2cstr
Backpatch all the way back to 9.1, where it was introduced by commit
50d89d42.
Reported by Sergey Burladyan in #9223
Author: Alex Hunsaker
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plperl/plperl.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 7ea428e845c..6b0c1cad5cb 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -303,6 +303,16 @@ static char *setlocale_perl(int category, char *locale); static char * hek2cstr(HE *he) { + char *ret; + SV *sv; + + /* + * HeSVKEY_force will return a temporary mortal SV*, so we need to make + * sure to free it with ENTER/SAVE/FREE/LEAVE + */ + ENTER; + SAVETMPS; + /*------------------------- * Unfortunately, while HeUTF8 is true for most things > 256, for values * 128..255 it's not, but perl will treat them as unicode code points if @@ -327,11 +337,17 @@ hek2cstr(HE *he) * right thing *------------------------- */ - SV *sv = HeSVKEY_force(he); + sv = HeSVKEY_force(he); if (HeUTF8(he)) SvUTF8_on(sv); - return sv2cstr(sv); + ret = sv2cstr(sv); + + /* free sv */ + FREETMPS; + LEAVE; + + return ret; } /* |