From 8d8d41f2644cd3a1292882daddb9780b596562aa Mon Sep 17 00:00:00 2001
From: Deep <deeppandya91@gmail.com>
Date: Mon, 29 Aug 2022 18:45:06 -0400
Subject: [PATCH] Sanitize intent

---
 .../searchwidget/SearchWidgetProviderActivity.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
index a4f52e9e754..1a3638b3439 100644
--- a/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
+++ b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
@@ -7,13 +7,25 @@
 
 package org.chromium.chrome.browser.searchwidget;
 
+import android.app.SearchManager;
 import android.content.Intent;
 
+import org.chromium.base.IntentUtils;
 import org.chromium.chrome.browser.searchwidget.SearchActivity;
+import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityConstants;
 
 public class SearchWidgetProviderActivity extends SearchActivity {
     @Override
     public void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
+        Intent newIntent = new Intent();
+        if (IntentUtils.safeGetStringExtra(intent, SearchManager.QUERY) != null) {
+            newIntent.putExtra(
+                    "query", IntentUtils.safeGetStringExtra(intent, SearchManager.QUERY));
+        }
+
+        if (intent.getAction().equals(SearchActivityConstants.ACTION_START_TEXT_SEARCH)) {
+            newIntent.setAction(SearchActivityConstants.ACTION_START_TEXT_SEARCH);
+        }
+        super.onNewIntent(newIntent);
     }
 }