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.

Sign up for GitHub

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

JDK-8262199: issue in jli args.c #2692

Closed
wants to merge 5 commits into from
+10 −17
Closed

JDK-8262199: issue in jli args.c #2692

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7846727
JDK-8262199
MBaesken Feb 23, 2021
8b106a1
Small changes
MBaesken Feb 23, 2021
b5eeca4
Remove fclose before exit
MBaesken Feb 25, 2021
39faea4
Simplify coding
MBaesken Feb 25, 2021
2da97d6
Replace reportAndExit
MBaesken Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/java.base/share/native/libjli/args.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -359,6 +359,7 @@ static void reportFcloseExit(FILE *fptr, const char* fmt, const char* arg) {
if (fptr != NULL) fclose(fptr);
exit(1);
}

This comment was marked as resolved.

Sign in to view

Copy link
Contributor

Choose a reason for hiding this comment

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

This function is "optionally report, optionally fclose, and then exit". Have you tried reducing it to reportAndExit and fclose inline in expandArgFile to avoid it doing 3 things?

Copy link
Member Author

@MBaesken MBaesken Feb 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This function is "optionally report, optionally fclose, and then exit". Have you tried reducing it to reportAndExit and fclose inline in expandArgFile to avoid it doing 3 things?

hi Alan , thanks for your remark , I did not do that because I would need to copy both lines (fclose + exit) to all callers.
On the other hand I wonder - wouldn't it be possible to avoid the fclose before the exit(1) ?
I assume the closing is done on exit anyway ?

Copy link
Contributor

Choose a reason for hiding this comment

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

That sounds okay to me, the process is exiting, as you say.


/*
* if the arg represent a file, that is, prefix with a single '@',
* return a list of arguments from the file.