Return more errors where possible when bzcat fails #317
Conversation
This file contains 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
7 tasks
ccawley2011
force-pushed
the
bzip-error
branch
from
c79303d
to
209fa23
Compare
landley
reviewed
Jan 18, 2022
| @@ -118,7 +121,7 @@ static unsigned int get_bits(struct bunzip_data *bd, char bits_wanted) | |||
| // If we need to read more data from file into byte buffer, do so | |||
| if (bd->inbufPos == bd->inbufCount) { | |||
| if (0 >= (bd->inbufCount = read(bd->in_fd, bd->inbuf, IOBUF_SIZE))) | |||
| error_exit("input EOF"); | |||
| error_exit("input EOF"); // TODO: return RETVAL_UNEXPECTED_INPUT_EOF | |||
There was a problem hiding this comment.
Why is this one a todo when others are converted?
| @@ -612,7 +619,8 @@ static int start_bunzip(struct bunzip_data **bdp, int src_fd, char *inbuf, | |||
| if (!len) i += IOBUF_SIZE; | |||
|
|
|||
| // Allocate bunzip_data. Most fields initialize to zero. | |||
| bd = *bdp = xzalloc(i); | |||
| bd = *bdp = (struct bunzip_data *)calloc(1, i); | |||
| if (!bd) return RETVAL_OUT_OF_MEMORY; | |||
| if (len) { | |||
There was a problem hiding this comment.
A) You don't need to typecast a void * in c, it gets automatically converted to any other pointer type on assignment.
B) Unless you're on a nommu system malloc() basically never returns out of memory because it's a virtual allocation, the physical pages get mapped as they're dirtied and that triggers the OOM killer.
| for (i=0; i<THREADS; i++) { | ||
| bd->bwdata[i].dbuf = (unsigned int *)malloc(bd->dbufSize * sizeof(int)); | ||
| if (!bd->bwdata[i].dbuf) return RETVAL_OUT_OF_MEMORY; | ||
| } | ||
|
|
There was a problem hiding this comment.
Still don't need to typecast a void * in C.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is based on the modified version of the code used by libxmp, minus the use of
setjmpandlongjmpto handlereadfailures.