8314148: Fix variable scope in SunMSCAPI

[djelinski]

Please review this patch that fixes the scope of 2 local variables to make sure they are in scope when they are used.

The patch additionally fixes one c++11-narrowing Clang warning by explicitly casting string size (size_t) to DWORD.

---

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-8314148: Fix variable scope in SunMSCAPI (Bug - P4)

Reviewers

• Valerie Peng (@valeriepeng - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15242

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back djelinski! 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]

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

• security

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.

[mlbridge]

Webrevs

• 01: Full - Incremental (e66639c6)
• 00: Full (ea9b8caa)

[mcpowers]

Don't lines 1181 and 1196 have the same problem?

[djelinski]

Good catch! Interestingly, that code appears to compile correctly. I'll fix it anyway.

[mcpowers]

Looks good to me.

[valeriepeng]

Looks good. Thanks!

[openjdk]

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

8314148: Fix variable scope in SunMSCAPI

Reviewed-by: valeriep

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 26 new commits pushed to the master branch:

• f142470: 8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
• 595fdd3: 8314059: Remove PKCS7.verify()
• 49b2984: 8313854: Some tests in serviceability area fail on localized Windows platform
• c132176: 8114830: (fs) Files.copy fails due to interference from something else changing the file system
• e56d3bc: 8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
• 4b2703a: 8313678: SymbolTable can leak Symbols during cleanup
• f41c267: 8314045: ArithmeticException in GaloisCounterMode
• 911d1db: 8314078: HotSpotConstantPool.lookupField() asserts due to field changes in ConstantPool.cpp
• 6574dd7: 8314025: Remove JUnit-based test in java/lang/invoke from problem list
• 207bd00: 8313756: [BACKOUT] 8308682: Enhance AES performance
• ... and 16 more: https://git.openjdk.org/jdk/compare/43462a36ab02b67d426c04d345868bd420b30c25...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.

[djelinski]

/integrate

[openjdk]

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

• 7fbad4c: 8310596: Utilize existing method frame::interpreter_frame_monitor_size_in_bytes()
• 752a438: 8314684: Add overview docs to loaderConstraints.cpp
• acd9310: 8313430: [JVMCI] fatal error: Never compilable: in JVMCI shutdown
• 8a5db6b: 8237542: JMapHeapConfigTest.java doesn't work with negative jlong values
• d0cc043: 8314550: [macosx-aarch64] serviceability/sa/TestJmapCore.java fails with "sun.jvm.hotspot.debugger.UnmappedAddressException: 801000800"
• 837d2e1: 8314483: Optionally override copyright header in generated source
• 3201623: 8310454: Introduce static-libs-graal bundle
• e9ba8d5: 8314960: Add Certigna Root CA - 2
• 837cf85: 8312547: Max/Min nodes Value implementation could be improved
• 7342f5a: 8314333: Update com/sun/jdi/ProcessAttachTest.java to use ProcessTools.createTestJvm(..)
• ... and 160 more: https://git.openjdk.org/jdk/compare/43462a36ab02b67d426c04d345868bd420b30c25...master

Your commit was automatically rebased without conflicts.

[openjdk]

@djelinski Pushed as commit 12de9b0.

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