From 56ab35423e2e626a9b92ed55087bba289cd71d97 Mon Sep 17 00:00:00 2001
From: AudricV <74829229+AudricV@users.noreply.github.com>
Date: Sat, 7 Oct 2023 21:02:28 +0200
Subject: [PATCH] [YouTube] Fix potential NullPointerException in
 YoutubeSearchExtractor.getSearchSuggestion

---
 .../youtube/extractors/YoutubeSearchExtractor.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java
index 2811a0d02..7af8bc706 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java
@@ -36,6 +36,7 @@ import org.schabi.newpipe.extractor.utils.JsonUtils;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -124,18 +125,17 @@ public class YoutubeSearchExtractor extends SearchExtractor {
         final JsonObject didYouMeanRenderer = itemSectionRenderer.getArray("contents")
                 .getObject(0)
                 .getObject("didYouMeanRenderer");
-        final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents")
-                .getObject(0)
-                .getObject("showingResultsForRenderer");
 
         if (!didYouMeanRenderer.isEmpty()) {
             return JsonUtils.getString(didYouMeanRenderer,
                     "correctedQueryEndpoint.searchEndpoint.query");
-        } else if (showingResultsForRenderer != null) {
-            return getTextFromObject(showingResultsForRenderer.getObject("correctedQuery"));
-        } else {
-            return "";
         }
+
+        return Objects.requireNonNullElse(
+                getTextFromObject(itemSectionRenderer.getArray("contents")
+                        .getObject(0)
+                        .getObject("showingResultsForRenderer")
+                        .getObject("correctedQuery")), "");
     }
 
     @Override