|
 |
04bfb0 |
From 12e1284a67e5e3404c704c3f864749fd9f04c7c4 Mon Sep 17 00:00:00 2001
|
|
|
04bfb0 |
From: Tony Cook <tony@develop-help.com>
|
|
|
04bfb0 |
Date: Wed, 7 Aug 2019 14:58:14 +1000
|
|
|
04bfb0 |
Subject: [PATCH] PerlIO::Via: check arg is non-NULL before using it.
|
|
|
04bfb0 |
MIME-Version: 1.0
|
|
|
04bfb0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
04bfb0 |
Content-Transfer-Encoding: 8bit
|
|
|
04bfb0 |
|
|
|
04bfb0 |
I can't find any code in core that ends up calling the _pushed handler
|
|
|
04bfb0 |
with arg == NULL, but PerlIO_push() is API, and there might be
|
|
|
04bfb0 |
CPAN or DarkPAN code out there that does, escpecially since there's
|
|
|
04bfb0 |
a check for arg being non-NULL further down.
|
|
|
04bfb0 |
|
|
|
04bfb0 |
CID 169261.
|
|
|
04bfb0 |
|
|
|
04bfb0 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
04bfb0 |
---
|
|
|
04bfb0 |
ext/PerlIO-via/via.xs | 4 ++--
|
|
|
04bfb0 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
04bfb0 |
|
|
|
04bfb0 |
diff --git a/ext/PerlIO-via/via.xs b/ext/PerlIO-via/via.xs
|
|
|
04bfb0 |
index d91c6855fc..8456242bc0 100644
|
|
|
04bfb0 |
--- a/ext/PerlIO-via/via.xs
|
|
|
04bfb0 |
+++ b/ext/PerlIO-via/via.xs
|
|
|
04bfb0 |
@@ -134,8 +134,8 @@ PerlIOVia_pushed(pTHX_ PerlIO * f, const char *mode, SV * arg,
|
|
|
04bfb0 |
{
|
|
|
04bfb0 |
IV code = PerlIOBase_pushed(aTHX_ f, mode, Nullsv, tab);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
- if (SvTYPE(arg) >= SVt_PVMG
|
|
|
04bfb0 |
- && mg_findext(arg, PERL_MAGIC_ext, &PerlIOVia_tag)) {
|
|
|
04bfb0 |
+ if (arg && SvTYPE(arg) >= SVt_PVMG
|
|
|
04bfb0 |
+ && mg_findext(arg, PERL_MAGIC_ext, &PerlIOVia_tag)) {
|
|
|
04bfb0 |
return code;
|
|
|
04bfb0 |
}
|
|
|
04bfb0 |
|
|
|
04bfb0 |
--
|
|
|
04bfb0 |
2.21.0
|
|
|
04bfb0 |
|