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

Jump to bottom

Add null check to feof #4357

Merged
merged 3 commits into from Sep 3, 2020
Merged

Add null check to feof #4357

merged 3 commits into from Sep 3, 2020

Conversation

oxarbitrage
Copy link
Contributor

@oxarbitrage oxarbitrage commented Feb 17, 2020 •
edited by str4d

Closes #2880

daira
daira approved these changes Mar 31, 2020
View reviewed changes
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

utACK

str4d
str4d previously requested changes Apr 9, 2020
View reviewed changes
Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

feof(src) is also called in an error message in CBufferedFile.Fill(); replace that call with a call to CBufferedFile.eof(). This works because CBufferedFile.Fill() is only called when nReadPos == nSrcPos.

src/streams.h Outdated Show resolved Hide resolved
therealyingtong
therealyingtong reviewed Aug 25, 2020
View reviewed changes
src/streams.h Outdated Show resolved Hide resolved
@daira daira dismissed str4d’s stale review August 25, 2020 13:26

Requested change addressed

therealyingtong
therealyingtong approved these changes Aug 25, 2020
View reviewed changes
Copy link
Contributor

@therealyingtong therealyingtong left a comment

Choose a reason for hiding this comment

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

utACK

@daira daira self-assigned this Aug 25, 2020
@str4d str4d added the C-bug Category: This is a bug label Aug 25, 2020
@daira daira force-pushed the issue2880 branch 2 times, most recently from 0a2076d to f5025ad Compare August 26, 2020 12:17
oxarbitrage and others added 3 commits August 26, 2020 13:19
@oxarbitrage @str4d
@therealyingtong @daira
Add null check to feof.
8686910 
Co-authored-by: Jack Grigg <jack@z.cash>
Co-authored-by: Ying Tong Lai <yingtong@electriccoin.co>
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
@daira
CBufferedFile: assert that Fill() is only called when nReadPos == nSr…
6c20de2 
…cPos, and simplify based on that assumption.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira @str4d
CBufferedFile: use eof() method rather than feof(src) in error message.
fb8dd9d 
Co-authored-by: Jack Grigg <jack@z.cash>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
str4d
str4d approved these changes Aug 28, 2020
View reviewed changes
Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

utACK

@daira
Copy link
Contributor

daira commented Sep 3, 2020

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Sep 3, 2020

📌 Commit fb8dd9d has been approved by daira

@str4d str4d added this to the Core Sprint 2020-35 milestone Sep 3, 2020
@zkbot
Copy link
Contributor

zkbot commented Sep 3, 2020

⌛ Testing commit fb8dd9d with merge af6ca14...

@zkbot
Copy link
Contributor

zkbot commented Sep 3, 2020

☀️ Test successful - pr-merge
Approved by: daira
Pushing af6ca14 to master...

@zkbot zkbot merged commit af6ca14 into zcash:master Sep 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daira daira daira approved these changes

@str4d str4d str4d approved these changes

@therealyingtong therealyingtong Awaiting requested review from therealyingtong

Assignees

@daira daira

Labels
C-bug Category: This is a bug
Projects
None yet
Milestone
Core Sprint 2020-35
Development

Successfully merging this pull request may close these issues.

zcash/src/streams.h
5 participants
@oxarbitrage @daira @zkbot @str4d @therealyingtong