[commons-fileupload] branch master updated: [FILEUPLOAD-352] NullPointerException in DiskFileItem#toString

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git


The following commit(s) were added to refs/heads/master by this push:
     new caee897e [FILEUPLOAD-352] NullPointerException in DiskFileItem#toString
     new 0a8f35a0 Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/commons-fileupload.git
caee897e is described below

commit caee897e42ec729c56383286aaee81d748669b9c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Sep 15 14:40:07 2023 -0400

    [FILEUPLOAD-352] NullPointerException in DiskFileItem#toString
---
 .../java/org/apache/commons/fileupload2/core/DiskFileItem.java   | 2 +-
 .../org/apache/commons/fileupload2/core/DiskFileItemTest.java    | 9 ++++++++-
 src/changes/changes.xml                                          | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItem.java
 
b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItem.java
index c21a7480..b2f9294c 100644
--- 
a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItem.java
+++ 
b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/core/DiskFileItem.java
@@ -432,7 +432,7 @@ public final class DiskFileItem implements 
FileItem<DiskFileItem> {
         if (cachedContent != null) {
             return cachedContent.length;
         }
-        return dfos.getByteCount();
+        return dfos != null ? dfos.getByteCount() : 0;
     }
 
     /**
diff --git 
a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
 
b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
index 2db29cb5..f0f0a8b9 100644
--- 
a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
+++ 
b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class DiskFileItemTest {
 
     @Test
-    void testBuilderHeaders() {
+    public void testBuilderHeaders() {
         final var builder = DiskFileItem.builder();
         assertNotNull(builder.getFileItemHeaders());
         final var fileItem = builder.get();
@@ -42,4 +42,11 @@ public class DiskFileItemTest {
         assertSame(fileItemHeaders, fileItem.getHeaders());
     }
 
+    /**
+     * Tests FILEUPLOAD-352 NullPointerException in DiskFileItem#toString
+     */
+    @Test
+    public void testToStringDefault() {
+        new DiskFileItem.Builder().get().toString();
+    }
 }
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d344b29e..8e9cb0ad 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
     <release version="2.0.0-M2" date="2023-MM-DD" description="2.0.0-M2 
Release">
       <!-- FIX -->
       <action                        dev="ggregory" type="add" due-to="James 
Reeves">Fix off-by-one error when checking fileSizeMax in FileItemInputImpl 
#235.</action>
+      <action issue="FILEUPLOAD-352" dev="ggregory" type="add" due-to="Björn 
Kautler, Gary Gregory">NullPointerException in DiskFileItem#toString.</action>
       <!-- ADD -->
       <action                        dev="ggregory" type="add" due-to="Gary 
Gregory">Refactor to support Jakarta Servlet 5 and 6.</action>
       <action                        dev="ggregory" type="add" due-to="Michal 
H Siemaszko, Gary Gregory">Generate some OSGi metadata.</action>