You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2026/06/23 15:08:15 UTC
(commons-imaging) branch master updated (e92fa1d6 -> a85663cc)
This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
from e92fa1d6 Merge pull request #552 from alhudz/fix-pcx-size-overflow
new 52dfff37 Sort members
new 2696d272 Fix int overflow in PCX image buffer sizing, now throws AllocationRequestException (#552).
new a85663cc Add Java 25 (LTS) to build matrix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 4 ++--
src/changes/changes.xml | 1 +
.../commons/imaging/common/XmpImagingParameters.java | 4 ++--
.../imaging/formats/tiff/TiffImagingParameters.java | 14 +++++++-------
.../commons/imaging/formats/pcx/PcxImageParserTest.java | 4 ++--
5 files changed, 14 insertions(+), 13 deletions(-)
(commons-imaging) 03/03: Add Java 25 (LTS) to build matrix
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit a85663ccd025ffaf487f1e651a6429568eb46d0a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 23 15:08:09 2026 +0000
Add Java 25 (LTS) to build matrix
Replace Java 25 with 26 on Ubuntu
---
.github/workflows/maven.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3bd33e0c..056e6ed9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,12 +28,12 @@ jobs:
max-parallel: 20
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
- java: [ 8, 11, 17, 21 ]
+ java: [ 8, 11, 17, 21, 25 ]
experimental: [false]
# Keep same order below (os, java experimental)
include:
- os: ubuntu-latest
- java: 25
+ java: 26
experimental: false
- os: ubuntu-latest
java: 27-ea
(commons-imaging) 01/03: Sort members
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 52dfff370dd06ddcb4f181f14fc22a9e0fbfdb47
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 23 15:04:19 2026 +0000
Sort members
---
.../commons/imaging/common/XmpImagingParameters.java | 4 ++--
.../imaging/formats/tiff/TiffImagingParameters.java | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java b/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
index cbd1805f..1462d889 100644
--- a/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
+++ b/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
@@ -27,6 +27,8 @@ import org.apache.commons.imaging.ImagingParameters;
*/
public class XmpImagingParameters<E extends XmpImagingParameters<E>> extends ImagingParameters<E> {
+ private String xmpXml;
+
/**
* Constructs a new instance.
*/
@@ -34,8 +36,6 @@ public class XmpImagingParameters<E extends XmpImagingParameters<E>> extends Ima
// Default constructor
}
- private String xmpXml;
-
/**
* Gets the XMP XML.
*
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
index d532a0fe..8d2227fe 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
@@ -26,13 +26,6 @@ import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
*/
public class TiffImagingParameters extends XmpImagingParameters<TiffImagingParameters> {
- /**
- * Constructs a new instance.
- */
- public TiffImagingParameters() {
- // Default constructor
- }
-
/**
* Indicates whether to read embedded thumbnails or not. Only applies to read EXIF metadata from JPEG/JFIF files.
*
@@ -107,6 +100,13 @@ public class TiffImagingParameters extends XmpImagingParameters<TiffImagingParam
*/
private Integer t6Options;
+ /**
+ * Constructs a new instance.
+ */
+ public TiffImagingParameters() {
+ // Default constructor
+ }
+
/**
* Clears settings for sub-image. Subsequent read operations will retrieve the entire image.
*/
(commons-imaging) 02/03: Fix int overflow in PCX image buffer sizing, now throws AllocationRequestException (#552).
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 2696d272de0f98c7f567e4d84176f5eb8dc4cf59
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 23 15:07:24 2026 +0000
Fix int overflow in PCX image buffer sizing, now throws
AllocationRequestException (#552).
---
src/changes/changes.xml | 1 +
.../org/apache/commons/imaging/formats/pcx/PcxImageParserTest.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d657fbe3..953817e4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -50,6 +50,7 @@ The <action> type attribute can be add,update,fix,remove.
<!-- FIX -->
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Apache RAT plugin console warnings.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Javadoc warnings.</action>
+ <action type="fix" dev="ggregory" due-to="alhuda, Gary Gregory">Fix int overflow in PCX image buffer sizing, now throws AllocationRequestException (#552).</action>
<!-- ADD -->
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 83 to 102 #527, #530, #539, #544, #546, #550.</action>
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxImageParserTest.java
index 683b52b8..b12ff23b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxImageParserTest.java
@@ -26,8 +26,8 @@ class PcxImageParserTest {
/**
* A 24-bit PCX header whose width and height are both 65536 makes {@code rowLength * ySize} overflow {@code int} and wrap to a tiny value, which used to
- * slip past the {@link AllocationRequestException} guard and allocate an undersized buffer. The size is now computed in {@code long}, so the real
- * request is rejected.
+ * slip past the {@link AllocationRequestException} guard and allocate an undersized buffer. The size is now computed in {@code long}, so the real request
+ * is rejected.
*/
@Test
void testBufferSizeOverflow() {