MSHARED-1130: Sanitised value nullability in match(Pattern, boolean, …

…String)
apache · Sep 8, 2022 · 6aaeffe · 6aaeffe
1 parent 37ea472
commit 6aaeffe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
@@ -650,7 +650,7 @@ public boolean matches( Artifactoid artifactoid )
     private static boolean match( final String pattern, final boolean containsAsterisk, final String value )
     {
         char[] patArr = pattern.toCharArray();
-        char[] strArr = value.toCharArray();
+        char[] strArr = value != null ? value.toCharArray() : new char[0];
         int patIdxStart = 0;
         int patIdxEnd = patArr.length - 1;
         int strIdxStart = 0;

diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
@@ -579,4 +579,26 @@ public void testmassembly955()
             assertTrue( filter.include( artifact2 ) );
         }
     }
+
+    @Test
+    public void testPartialWildcardShouldNotMatchEmptyComponent()
+    {
+        Artifact artifact = mock( Artifact.class );
+        when( artifact.getGroupId() ).thenReturn( "test-group" );
+        when( artifact.getArtifactId() ).thenReturn( "test-artifact" );
+        when( artifact.getVersion() ).thenReturn( "test-version" );
+        when( artifact.getType() ).thenReturn( null );
+
+        final ArtifactFilter filter = createFilter(
+                Collections.singletonList( "test-group:test-artifact:*:ERROR*" ) );
+
+        if ( isInclusionNotExpected() )
+        {
+            assertTrue( filter.include( artifact ) );
+        }
+        else
+        {
+            assertFalse( filter.include( artifact ) );
+        }
+    }
 }