version 3.12 to address CVE-2021-36770

dankogai · dankogai · commit 527e482dc70b · 2021-08-09T23:19:25.000+09:00
diff --git a/Changes b/Changes
@@ -1,8 +1,12 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 3.11 2021/07/23 02:26:54 dankogai Exp dankogai $
+# $Id: Changes,v 3.12 2021/08/09 14:17:04 dankogai Exp dankogai $
 #
-$Revision: 3.11 $ $Date: 2021/07/23 02:26:54 $
+$Revision: 3.12 $ $Date: 2021/08/09 14:17:04 $
+! Encode.pm
+  Address CVE-2021-36770
+  <9639159a-d070-4762-9cbd-f1622f10449c@beta.fastmail.com>
+3.11 2021/07/23 02:26:54
 ! Unicode/Unicode.xs
 + t/Unicode_trailing_nul.t
   Pulled: Ensure that UTF-16 decode always includes a trailing NUL.
diff --git a/Encode.pm b/Encode.pm
@@ -1,13 +1,13 @@
 #
-# $Id: Encode.pm,v 3.11 2021/07/23 02:26:02 dankogai Exp $
+# $Id: Encode.pm,v 3.12 2021/08/09 14:17:04 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
 use warnings;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 our $VERSION;
 BEGIN {
-    $VERSION = sprintf "%d.%02d", q$Revision: 3.11 $ =~ /(\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;
 };
 
diff --git a/Unicode/Unicode.xs b/Unicode/Unicode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Unicode.xs,v 2.20 2021/07/23 02:26:54 dankogai Exp dankogai $
+ $Id: Unicode.xs,v 2.20 2021/07/23 02:26:54 dankogai Exp $
  */
 
 #define IN_UNICODE_XS
diff --git a/t/Unicode.t b/t/Unicode.t
@@ -1,5 +1,5 @@
 #
-# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp dankogai $
+# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp $
 #
 # This script is written entirely in ASCII, even though quoted literals
 # do include non-BMP unicode characters -- Are you happy, jhi?

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp dankogai $`
	`2`	`+# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp $`
`3`	`3`	`#`
`4`	`4`	`# This script is written entirely in ASCII, even though quoted literals`
`5`	`5`	`# do include non-BMP unicode characters -- Are you happy, jhi?`