Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8302151: BMPImageReader throws an exception reading BMP images #12573

Closed
wants to merge 1 commit into from

Conversation

jayathirthrao
Copy link
Member

@jayathirthrao jayathirthrao commented Feb 15, 2023

We have check in BMPImageReader, where we verify image data size using BMP file size and bitmap offset value.
But we can't rely on this calculation when we have color palette. Also color palette is necessary in BMP when bits per pixel is less than 16 according to BMP specification(https://learn.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-bitmapv4header).

Now extra checks are added to not perform this check when we have color palette or bpp is less than 16.

Also when bitsPerPixel was less than 8 it was getting down-casted to 0. So this is also resolved by making this check for >=16bpp and not doing (bitsPerPixel / 8)


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8302151: BMPImageReader throws an exception reading BMP images

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12573/head:pull/12573
$ git checkout pull/12573

Update a local copy of the PR:
$ git checkout pull/12573
$ git pull https://git.openjdk.org/jdk pull/12573/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12573

View PR using the GUI difftool:
$ git pr show -t 12573

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12573.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 15, 2023

👋 Welcome back jdv! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 15, 2023
@openjdk
Copy link

openjdk bot commented Feb 15, 2023

@jayathirthrao The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Feb 15, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 15, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 20, 2023

@jayathirthrao This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8302151: BMPImageReader throws an exception reading BMP images

Reviewed-by: serb, tr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 298 new commits pushed to the master branch:

  • 29f392e: 8299522: Incorrect size of Approve button in custom JFileChooser
  • 43c71dd: 8302453: RISC-V: Add support for small width vector operations
  • 91a2b5e: 8302905: arm32 Raspberry Pi OS build broken by JDK-8301494
  • bb3dfd6: 8302879: doc/building.md update link to jtreg builds
  • 36a0822: 8302369: Reduce the stack size of the C1 compiler
  • 0bf3a53: 8302599: Extend ASan support to Microsoft Visual C++
  • c7517b3: 8302525: Write a test to check various components send Events while mouse and key are used simultaneously
  • 9a79722: 8299234: JMX Repository.query performance
  • e47e9ec: 8300658: memory_and_swap_limit() reporting wrong values on systems with swapaccount=0
  • 7cf7e0a: 8302070: Factor null-check into load_klass() calls
  • ... and 288 more: https://git.openjdk.org/jdk/compare/09bfbf80639f059563fcd4432995b8c380cea298...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 20, 2023
Copy link
Contributor

@TejeshR13 TejeshR13 left a comment

Choose a reason for hiding this comment

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

Fix verified.

@jayathirthrao
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 21, 2023

Going to push as commit aa10f0d.
Since your change was applied there have been 300 commits pushed to the master branch:

  • 16a4f02: 8302150: Speed up compiler/codegen/Test7100757.java
  • 17274c7: 8302146: Move TestOverloadCompileQueues.java to tier3
  • 29f392e: 8299522: Incorrect size of Approve button in custom JFileChooser
  • 43c71dd: 8302453: RISC-V: Add support for small width vector operations
  • 91a2b5e: 8302905: arm32 Raspberry Pi OS build broken by JDK-8301494
  • bb3dfd6: 8302879: doc/building.md update link to jtreg builds
  • 36a0822: 8302369: Reduce the stack size of the C1 compiler
  • 0bf3a53: 8302599: Extend ASan support to Microsoft Visual C++
  • c7517b3: 8302525: Write a test to check various components send Events while mouse and key are used simultaneously
  • 9a79722: 8299234: JMX Repository.query performance
  • ... and 290 more: https://git.openjdk.org/jdk/compare/09bfbf80639f059563fcd4432995b8c380cea298...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 21, 2023
@openjdk openjdk bot closed this Feb 21, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 21, 2023
@openjdk
Copy link

openjdk bot commented Feb 21, 2023

@jayathirthrao Pushed as commit aa10f0d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants