perl-Encode/backport-CVE-2021-36770.patch
wangjiang 1ce9ee1e1e fix CVE-2021-36770
(cherry picked from commit 9c6bfb3b6501f6d34081e27598cf591a31aca880)
2022-02-28 17:10:18 +08:00

37 lines
978 B
Diff

From 527e482dc70b035d0df4f8c77a00d81f8d775c74 Mon Sep 17 00:00:00 2001
From: Dan Kogai <dankogai+github@github.com>
Date: Mon, 9 Aug 2021 23:19:25 +0900
Subject: [PATCH] version 3.12 to address CVE-2021-36770
---
Encode.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Encode.pm b/Encode.pm
index de06ba1..0bb44dd 100644
--- a/Encode.pm
+++ b/Encode.pm
@@ -7,7 +7,7 @@ use warnings;
use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
our $VERSION;
BEGIN {
- $VERSION = sprintf "%d.%02d", q$Revision: 3.06 $ =~ /(\d+)/g;
+ $VERSION = sprintf "%d.%02d", q$Revision: 3.12 $ =~ /(\d+)/g;
require XSLoader;
XSLoader::load( __PACKAGE__, $VERSION );
}
@@ -65,8 +65,8 @@ require Encode::Config;
eval {
local $SIG{__DIE__};
local $SIG{__WARN__};
- local @INC = @INC || ();
- pop @INC if $INC[-1] eq '.';
+ local @INC = @INC;
+ pop @INC if @INC && $INC[-1] eq '.';
require Encode::ConfigLocal;
};
--
2.27.0