commit 8f0034ce1e7854521e259a5eaf71859b1e6f95bc
author emilyguo <emilyguo@google.com> Sat Apr 09 10:09:52 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Apr 09 10:11:53 2022 -0700
tree c3ee7fce3248ee6db87fa99fa53902fb5c32ec4b
parent 6dbf4a2d95763b56bb6419859340192011e728eb

Fix `GlobValue` NPE bug.

PiperOrigin-RevId: 440588414

src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
index 752036e..2720411 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
@@ -177,6 +177,10 @@
             return null;
           }
           GlobValue globValue = (GlobValue) listingAndRecursiveGlobResult.next();
+          if (globValue == null) {
+            // has exception, will be handled later.
+            return null;
+          }
           matches.addTransitive(globValue.getMatches());
           listingValue = (DirectoryListingValue) listingAndRecursiveGlobResult.next();
         }

src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 19ae251..1a820e9 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -656,6 +656,15 @@
   }
 
   @Test
+  public void testDoubleStarPatternWithErrorChild() throws Exception {
+    FileSystemUtils.ensureSymbolicLink(pkgPath.getChild("self"), "self");
+
+    IOException ioException =
+        assertThrows(IOException.class, () -> runGlob("**/self", Operation.FILES));
+    assertThat(ioException).hasMessageThat().matches("Symlink cycle");
+  }
+
+  @Test
   public void testDoubleStarPatternWithChildGlob() throws Exception {
     assertGlobMatches("**/ba*", "foo/bar", "foo/barnacle", "food/barnacle", "fool/barnacle");
   }