From 90c3745829de17c13aded8de52bf703758bfc7e1 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Reddy Balireddy <pavankumarreddy_balireddy@comcast.com>
Date: Mon, 28 Sep 2026 08:11:45 +0530
Subject: [PATCH] RDKB-67070 : In $_GET Skip empty segments and treat a missing
 '=' as an empty string value

---
 jsts/jst_prefix.js                            | 10 +++++---
 tests/parser/jst_parser_backslash.jst.parsed  | 10 +++++---
 .../parser/jst_parser_comment_tag.jst.parsed  | 10 +++++---
 .../jst_parser_include_code_after.jst.parsed  | 10 +++++---
 .../jst_parser_include_code_before.jst.parsed | 10 +++++---
 .../jst_parser_include_malformed_1.jst.parsed | 10 +++++---
 .../jst_parser_include_nested.jst.parsed      | 10 +++++---
 ...include_not_if_in_block_comment.jst.parsed | 10 +++++---
 ...arser_include_not_if_in_content.jst.parsed | 10 +++++---
 ..._include_not_if_in_line_comment.jst.parsed | 10 +++++---
 .../parser/jst_parser_include_once.jst.parsed | 10 +++++---
 .../jst_parser_include_runtime.jst.parsed     | 10 +++++---
 .../jst_parser_include_unknown.jst.parsed     | 10 +++++---
 tests/parser/jst_parser_line_feeds.jst.parsed | 10 +++++---
 .../jst_parser_single_quotes.jst.parsed       | 10 +++++---
 .../jst_parser_skip_whitespace.jst.parsed     | 10 +++++---
 ...t_parser_template_block_content.jst.parsed | 10 +++++---
 ...st_parser_template_block_string.jst.parsed | 10 +++++---
 tests/parser/jst_prefix.js                    | 10 +++++---
 tests/parser_test.cpp                         | 24 +++++++++++++++++++
 20 files changed, 157 insertions(+), 57 deletions(-)

diff --git a/jsts/jst_prefix.js b/jsts/jst_prefix.js
index 412fc0d..df2298e 100644
--- a/jsts/jst_prefix.js
+++ b/jsts/jst_prefix.js
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0; i<ar.length; ++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_backslash.jst.parsed b/tests/parser/jst_parser_backslash.jst.parsed
index d3288a8..6dd61c7 100644
--- a/tests/parser/jst_parser_backslash.jst.parsed
+++ b/tests/parser/jst_parser_backslash.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_comment_tag.jst.parsed b/tests/parser/jst_parser_comment_tag.jst.parsed
index dbbdaab..2d2b40f 100644
--- a/tests/parser/jst_parser_comment_tag.jst.parsed
+++ b/tests/parser/jst_parser_comment_tag.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_code_after.jst.parsed b/tests/parser/jst_parser_include_code_after.jst.parsed
index 4967fc3..16190a9 100644
--- a/tests/parser/jst_parser_include_code_after.jst.parsed
+++ b/tests/parser/jst_parser_include_code_after.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_code_before.jst.parsed b/tests/parser/jst_parser_include_code_before.jst.parsed
index cdc6084..4b3049b 100644
--- a/tests/parser/jst_parser_include_code_before.jst.parsed
+++ b/tests/parser/jst_parser_include_code_before.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_malformed_1.jst.parsed b/tests/parser/jst_parser_include_malformed_1.jst.parsed
index 8f61d6c..359ad59 100644
--- a/tests/parser/jst_parser_include_malformed_1.jst.parsed
+++ b/tests/parser/jst_parser_include_malformed_1.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_nested.jst.parsed b/tests/parser/jst_parser_include_nested.jst.parsed
index da0b84f..1f8976d 100644
--- a/tests/parser/jst_parser_include_nested.jst.parsed
+++ b/tests/parser/jst_parser_include_nested.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_not_if_in_block_comment.jst.parsed b/tests/parser/jst_parser_include_not_if_in_block_comment.jst.parsed
index 26ce91e..2c41601 100644
--- a/tests/parser/jst_parser_include_not_if_in_block_comment.jst.parsed
+++ b/tests/parser/jst_parser_include_not_if_in_block_comment.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_not_if_in_content.jst.parsed b/tests/parser/jst_parser_include_not_if_in_content.jst.parsed
index cc96393..9b48c82 100644
--- a/tests/parser/jst_parser_include_not_if_in_content.jst.parsed
+++ b/tests/parser/jst_parser_include_not_if_in_content.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_not_if_in_line_comment.jst.parsed b/tests/parser/jst_parser_include_not_if_in_line_comment.jst.parsed
index aa286b3..4d7a9c4 100644
--- a/tests/parser/jst_parser_include_not_if_in_line_comment.jst.parsed
+++ b/tests/parser/jst_parser_include_not_if_in_line_comment.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_once.jst.parsed b/tests/parser/jst_parser_include_once.jst.parsed
index acfe819..1bd73c5 100644
--- a/tests/parser/jst_parser_include_once.jst.parsed
+++ b/tests/parser/jst_parser_include_once.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_runtime.jst.parsed b/tests/parser/jst_parser_include_runtime.jst.parsed
index 4fb19b1..5242cbf 100644
--- a/tests/parser/jst_parser_include_runtime.jst.parsed
+++ b/tests/parser/jst_parser_include_runtime.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_include_unknown.jst.parsed b/tests/parser/jst_parser_include_unknown.jst.parsed
index 909f8b5..4d1487f 100644
--- a/tests/parser/jst_parser_include_unknown.jst.parsed
+++ b/tests/parser/jst_parser_include_unknown.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_line_feeds.jst.parsed b/tests/parser/jst_parser_line_feeds.jst.parsed
index 41d02e3..26426b7 100644
--- a/tests/parser/jst_parser_line_feeds.jst.parsed
+++ b/tests/parser/jst_parser_line_feeds.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_single_quotes.jst.parsed b/tests/parser/jst_parser_single_quotes.jst.parsed
index 153541e..b268699 100644
--- a/tests/parser/jst_parser_single_quotes.jst.parsed
+++ b/tests/parser/jst_parser_single_quotes.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_skip_whitespace.jst.parsed b/tests/parser/jst_parser_skip_whitespace.jst.parsed
index 7a1b138..22a094a 100644
--- a/tests/parser/jst_parser_skip_whitespace.jst.parsed
+++ b/tests/parser/jst_parser_skip_whitespace.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_template_block_content.jst.parsed b/tests/parser/jst_parser_template_block_content.jst.parsed
index a94cf89..9e05a48 100644
--- a/tests/parser/jst_parser_template_block_content.jst.parsed
+++ b/tests/parser/jst_parser_template_block_content.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_parser_template_block_string.jst.parsed b/tests/parser/jst_parser_template_block_string.jst.parsed
index ec10868..006d503 100644
--- a/tests/parser/jst_parser_template_block_string.jst.parsed
+++ b/tests/parser/jst_parser_template_block_string.jst.parsed
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0;i<ar.length;++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser/jst_prefix.js b/tests/parser/jst_prefix.js
index 412fc0d..df2298e 100644
--- a/tests/parser/jst_prefix.js
+++ b/tests/parser/jst_prefix.js
@@ -283,10 +283,14 @@ $_GET= (function ()
     var ar = qs.split('&');
     for(var i=0; i<ar.length; ++i)
     {
-      var eqIdx = ar[i].indexOf('=');
+      var part = ar[i];
+      if(part === "")
+        continue;
+      var eqIdx = part.indexOf('=');
       if(eqIdx == -1)
-        throw Error("$_GET: Invalid QUERY_STRING");
-      out[ar[i].substring(0, eqIdx)] = ar[i].substring(eqIdx + 1);
+        out[part] = "";
+      else
+        out[part.substring(0, eqIdx)] = part.substring(eqIdx + 1);
     }
   }
   return out;
diff --git a/tests/parser_test.cpp b/tests/parser_test.cpp
index 143c5f2..df6264f 100644
--- a/tests/parser_test.cpp
+++ b/tests/parser_test.cpp
@@ -356,6 +356,30 @@ TEST(general, prefix_preserves_equals_signs_in_request_values)
   duk_destroy_heap(ctx);
 }
 
+TEST(general, prefix_get_tolerates_trailing_ampersand_and_valueless_params)
+{
+  EnvVarGuard query_string_guard("QUERY_STRING");
+  query_string_guard.set("mac_ssid=&");
+
+  duk_context* ctx = duk_create_heap_default();
+  ASSERT_NE(ctx, nullptr);
+  evaluatePrefixWithRequestData(ctx, nullptr, nullptr);
+
+  EXPECT_TRUE(evaluateJavaScriptBoolean(ctx, "$_GET.mac_ssid === ''"));
+
+  duk_destroy_heap(ctx);
+
+  query_string_guard.set("mac_ssid");
+
+  duk_context* ctx2 = duk_create_heap_default();
+  ASSERT_NE(ctx2, nullptr);
+  evaluatePrefixWithRequestData(ctx2, nullptr, nullptr);
+
+  EXPECT_TRUE(evaluateJavaScriptBoolean(ctx2, "$_GET.mac_ssid === ''"));
+
+  duk_destroy_heap(ctx2);
+}
+
 TEST(general, session_create_multiple_calls_succeed)
 {
   duk_context* ctx = duk_create_heap_default();