Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-1722: Rethrow NegativeArraySizeException as SerializationException in SerilizationUtils.deserialize(InputStream) (#1141) 

* LANG-1722: Catch NegativeArraySizeException

Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>

* Fix unit test formatting

Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>

---------

Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>
This commit is contained in:
Arthur Chan 2023-12-07 13:44:58 +00:00 committed by GitHub
parent 3760ad0838
commit c3f5f3204b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/lang3/SerializationUtils.java
View File

@ -207,7 +207,7 @@ public class SerializationUtils {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final T obj = (T) in.readObject(); final T obj = (T) in.readObject();
return obj; return obj;
} catch (final ClassNotFoundException | IOException ex) { } catch (final ClassNotFoundException | IOException | NegativeArraySizeException ex) {
throw new SerializationException(ex); throw new SerializationException(ex);
} }
} }

9
src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
View File

@ -360,4 +360,13 @@ public class SerializationUtilsTest extends AbstractLangTest {
assertThrows(SerializationException.class, () -> SerializationUtils.serialize(iMap, streamTest)); assertThrows(SerializationException.class, () -> SerializationUtils.serialize(iMap, streamTest));
} }
@Test
public void testNegativeByteArray() throws IOException {
final byte[] byteArray = {
(byte) -84, (byte) -19, (byte) 0, (byte) 5, (byte) 125, (byte) -19, (byte) 0,
(byte) 5, (byte) 115, (byte) 114, (byte) -1, (byte) 97, (byte) 122, (byte) -48, (byte) -65
};
assertThrows(SerializationException.class, () -> SerializationUtils.deserialize(new ByteArrayInputStream(byteArray)));
}
} }