From 41ffa719335d3d04c4576cfb35935d47954cd779 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 16 Aug 2026 13:20:07 -0400 Subject: [PATCH v1] Close up some more gaps in plperl and hstore_plperl. plperl_to_hstore() failed to check for a null-pointer result from HeVAL(), leading to SIGSEGV. This is possible at least with tied hashes. Interpret such a result as SQL NULL, as we do elsewhere. plperl_func_handler()'s stanza for handling an arrayref result in a SETOF function could loop forever (or at least till OOM) when given a tied array, since av_fetch won't necessarily ever return a null pointer in that case. Be consistent with the other places where we traverse a perl array: call av_len() once and use that value as the loop limit, silently ignoring any null pointers we get back from that range of subscripts. The known test cases for these errors require perl's Tie modules, which are often not present, so it doesn't seem worth the trouble to create regression test cases that would cover them. Reported-by: Claude Code (via Noah Misch) Author: Tom Lane Backpatch-through: 14 --- contrib/hstore_plperl/hstore_plperl.c | 2 +- src/pl/plperl/plperl.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c index d7f1b8ddb48..197d84141e5 100644 --- a/contrib/hstore_plperl/hstore_plperl.c +++ b/contrib/hstore_plperl/hstore_plperl.c @@ -150,7 +150,7 @@ plperl_to_hstore(PG_FUNCTION_ARGS) pairs[i].keylen = hstoreCheckKeyLen(strlen(pairs[i].key)); pairs[i].needfree = true; - if (!SvOK(value)) + if (!value || !SvOK(value)) { pairs[i].val = NULL; pairs[i].vallen = 0; diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index eba91f2d7d6..3d4b675762d 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -2478,14 +2478,15 @@ plperl_func_handler(PG_FUNCTION_ARGS) if (sav) { dTHX; - int i = 0; - SV **svp = 0; AV *rav = (AV *) SvRV(sav); + int alen = av_len(rav) + 1; - while ((svp = av_fetch(rav, i, FALSE)) != NULL) + for (int i = 0; i < alen; i++) { - plperl_return_next_internal(*svp); - i++; + SV **svp = av_fetch(rav, i, FALSE); + + if (svp) + plperl_return_next_internal(*svp); } } else if (SvOK(perlret)) -- 2.52.0