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

8274929: Crash while reading specific clipboard content #662

Closed

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Nov 9, 2021

This bug is caused by not sanity checking the data returned by a call to the Windows Clipboard IDataObject::GetData method. When requesting a file descriptor with a format of either CFSTR_FILEDESCRIPTORA or CFSTR_FILEDESCRIPTORW, which returns a list of file names, the first word of the returned data buffer is supposed to be the number of items that follow. Applications can put data on the clipboard in such a way that it will respond to a request to return the list of files from the clipboard with data that isn't formatted correctly, so we can't assume that the first word is a valid count.

The fix is to check the returned buffer size against the item count. I added a regression test that fails before and passes after the fix.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274929: Crash while reading specific clipboard content

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/662/head:pull/662
$ git checkout pull/662

Update a local copy of the PR:
$ git checkout pull/662
$ git pull https://git.openjdk.java.net/jfx pull/662/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 662

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/662.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 9, 2021

👋 Welcome back kcr! 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 Ready for review label Nov 9, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 9, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 11, 2021

@kevinrushforth 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:

8274929: Crash while reading specific clipboard content

Reviewed-by: mstrauss, arapte, pbansal

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Ready to be integrated label Nov 11, 2021
Copy link
Collaborator

@pankaj-bansal pankaj-bansal left a comment

Choose a reason for hiding this comment

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

The changes look fine to me

import sun.awt.datatransfer.ClipboardTransferable;
import sun.awt.datatransfer.SunClipboard;

import static org.junit.Assert.*;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am not sure about how strict we are about using wildcard imports in tests in JavaFX. You can change this or keep it as it is, depending upon the answer to the first statement.

Copy link
Member Author

Choose a reason for hiding this comment

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

In general wildcard imports are discouraged; static imports (e.g., Assert.*) are an exception used in many of our tests.

@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 11, 2021

Going to push as commit effcc86.

@openjdk openjdk bot closed this Nov 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Nov 11, 2021
@openjdk
Copy link

openjdk bot commented Nov 11, 2021

@kevinrushforth Pushed as commit effcc86.

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

@kevinrushforth kevinrushforth deleted the 8274929-clipboard-crash branch November 11, 2021 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
4 participants