merge revision(s) 4e0bb58a0a374b40b7691e7b7aa88e759a0fc9f2: [Backport #21811]

	[PATCH] fix underflow

2 files changed, 2 insertions, 2 deletions

diff --git a/pack.c b/pack.c
index 3a5c1bfb96..87a5c67871 100644
--- a/pack.c
+++ b/pack.c
@@ -302,7 +302,7 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
         else if (ISDIGIT(*p)) {
             errno = 0;
             len = STRTOUL(p, (char**)&p, 10);
-            if (errno) {
+            if (len < 0 || errno) {
                 rb_raise(rb_eRangeError, "pack length too big");
             }
         }
diff --git a/version.h b/version.h
index 304bcfa8ca..74fc7c27a8 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 79
+#define RUBY_PATCHLEVEL 80
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"