[flang][runtime] Skip unused truncated list-directed character input #118320
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang:runtime
flang
Member
|
@llvm/pr-subscribers-flang-runtime Author: Peter Klausler (klausler) ChangesWhen reading non-delimited list-directed character input, read the whole field even if it doesn't fit into the variable. Fixes #118277. Full diff: https://github.com/llvm/llvm-project/pull/118320.diff 1 Files Affected:
diff --git a/flang/runtime/edit-input.cpp b/flang/runtime/edit-input.cpp
index 2cee35e23f31a3..a8c52ea93a6109 100644
--- a/flang/runtime/edit-input.cpp
+++ b/flang/runtime/edit-input.cpp
@@ -979,7 +979,7 @@ static RT_API_ATTRS bool EditListDirectedCharacterInput(
// or the end of the current record. Subtlety: the "remaining" count
// here is a dummy that's used to avoid the interpretation of separators
// in NextInField.
- Fortran::common::optional<int> remaining{length > 0 ? maxUTF8Bytes : 0};
+ Fortran::common::optional<int> remaining{maxUTF8Bytes};
while (Fortran::common::optional<char32_t> next{
io.NextInField(remaining, edit)}) {
bool isSep{false};
@@ -1005,8 +1005,11 @@ static RT_API_ATTRS bool EditListDirectedCharacterInput(
if (isSep) {
remaining = 0;
} else {
- *x++ = *next;
- remaining = --length > 0 ? maxUTF8Bytes : 0;
+ if (length > 0) {
+ *x++ = *next;
+ --length;
+ }
+ remaining = maxUTF8Bytes;
}
}
Fortran::runtime::fill_n(x, length, ' ');
|
When reading non-delimited list-directed character input, read the whole field even if it doesn't fit into the variable. Fixes llvm#118277.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When reading non-delimited list-directed character input, read the whole field even if it doesn't fit into the variable.
Fixes #118277.