src: fix UB in overflow checks

Refs: #45868 PR-URL: #45882 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Jan 31, 2023 · e4fc3ab · e4fc3ab
1 parent 574afac
commit e4fc3ab
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
@@ -24,8 +24,9 @@
 #include "stream_wrap.h"
 #include "util-inl.h"

-#include <cstring>
+#include <climits>
 #include <cstdlib>
+#include <cstring>

 namespace node {

@@ -190,7 +191,7 @@ class ProcessWrap : public HandleWrap {
    if (!argv_v.IsEmpty() && argv_v->IsArray()) {
      Local<Array> js_argv = argv_v.As<Array>();
      int argc = js_argv->Length();
-      CHECK_GT(argc + 1, 0);  // Check for overflow.
+      CHECK_LT(argc, INT_MAX);  // Check for overflow.

      // Heap allocate to detect errors. +1 is for nullptr.
      options.args = new char*[argc + 1];
@@ -218,7 +219,7 @@ class ProcessWrap : public HandleWrap {
    if (!env_v.IsEmpty() && env_v->IsArray()) {
      Local<Array> env_opt = env_v.As<Array>();
      int envc = env_opt->Length();
-      CHECK_GT(envc + 1, 0);  // Check for overflow.
+      CHECK_LT(envc, INT_MAX);            // Check for overflow.
      options.env = new char*[envc + 1];  // Heap allocated to detect errors.
      for (int i = 0; i < envc; i++) {
        node::Utf8Value pair(env->isolate(),