Skip to content

Commit

Permalink
8302151: BMPImageReader throws an exception reading BMP images
Browse files Browse the repository at this point in the history
Backport-of: aa10f0d3ee5d77d83950c9ed4aab11589b822ff4
  • Loading branch information
GoeLin committed Apr 20, 2023
1 parent 14e3103 commit 17f5448
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,10 @@ else if (size == 124)
height = Math.abs(height);
}

if (metadata.compression == BI_RGB) {
long imageDataSize = ((long)width * height * (bitsPerPixel / 8));
if (metadata.compression == BI_RGB &&
metadata.paletteSize == 0 &&
metadata.bitsPerPixel >= 16) {
long imageDataSize = (((long)width * height * bitsPerPixel) / 8);
if (imageDataSize > (bitmapFileSize - bitmapOffset)) {
throw new IIOException(I18N.getString("BMPImageReader9"));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
* @bug 8302151
* @summary Tests that we should not try to calculate bitmap image
size using bitmap file size when we have a color palette
*/

import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
import javax.imageio.ImageIO;

public class BMP1bppImageWithPaletteTest {

public static void main(String[] args) throws IOException {
// incomplete 1bpp BMP byte stream with color palette and
// invalid file size data
byte[] corruptedBmp = { (byte) 0x42, (byte) 0x4d, (byte) 0x0e,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x3e, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x28, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0xa2, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xb4,
(byte) 0x08, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x00,
(byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0xe0, (byte) 0x57, (byte) 0x07, (byte) 0x00,
(byte) 0xc2, (byte) 0x1e, (byte) 0x00, (byte) 0x00, (byte) 0xc2,
(byte) 0x1e, (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff
};

// We expect EOFException to be thrown
try {
ImageIO.read(new ByteArrayInputStream(corruptedBmp));
} catch(Exception ex) {
if (!(ex instanceof EOFException))
throw ex;
}
}
}

1 comment on commit 17f5448

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.