SOLR-16949: Tolerate null bytes / empty file

janhoy · janhoy · commit 143fa6f09ac1 · 2023-12-13T16:07:34.000+01:00
diff --git a/solr/core/src/java/org/apache/solr/util/FileTypeMagicUtil.java b/solr/core/src/java/org/apache/solr/util/FileTypeMagicUtil.java
@@ -142,6 +142,8 @@ public static boolean isFileForbiddenInConfigset(InputStream fileStream) {
    * @return true if file is among the forbidden mime-types
    */
   public static boolean isFileForbiddenInConfigset(byte[] bytes) {
+    if (bytes == null || bytes.length == 0)
+      return false; // A ZK znode may be a folder with no content
     return isFileForbiddenInConfigset(new ByteArrayInputStream(bytes));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ public static boolean isFileForbiddenInConfigset(InputStream fileStream) {`
`142`	`142`	`* @return true if file is among the forbidden mime-types`
`143`	`143`	`*/`
`144`	`144`	`public static boolean isFileForbiddenInConfigset(byte[] bytes) {`
	`145`	`+ if (bytes == null \|\| bytes.length == 0)`
	`146`	`+ return false; // A ZK znode may be a folder with no content`
`145`	`147`	`return isFileForbiddenInConfigset(new ByteArrayInputStream(bytes));`
`146`	`148`	`}`
`147`	`149`