ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use safer comparisons (only matters when sizeof(int) != sizeof(size_t)). fread

Browse source 
and fwrite return size_t, so it is safer to cast up to the largest type for the
comparison. I believe the cast is required at all to remove compiler warnings.
This commit is contained in:
Trent Mick 2000-08-12 20:58:11 +00:00
parent 46cc7c0f7b
commit 6c116dd56b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/arraymodule.c
View file

@ -1039,8 +1039,8 @@ array_tofile(arrayobject *self, PyObject *args)
return NULL;
}
if (self->ob_size > 0) {
if ((int)fwrite(self->ob_item, self->ob_descr->itemsize,
self->ob_size, fp) != self->ob_size) {
if (fwrite(self->ob_item, self->ob_descr->itemsize,
self->ob_size, fp) != (size_t)self->ob_size) {
PyErr_SetFromErrno(PyExc_IOError);
clearerr(fp);
return NULL;

4
Modules/cPickle.c
View file

@ -407,7 +407,7 @@ write_file(Picklerobject *self, char *s, int n) {
return 0;
}
if ((int)fwrite(s, sizeof(char), n, self->fp) != n) {
if (fwrite(s, sizeof(char), n, self->fp) != (size_t)n) {
PyErr_SetFromErrno(PyExc_IOError);
return -1;
}
@ -503,7 +503,7 @@ read_file(Unpicklerobject *self, char **s, int n) {
self->buf_size = n;
}
if ((int)fread(self->buf, sizeof(char), n, self->fp) != n) {
if (fread(self->buf, sizeof(char), n, self->fp) != (size_t)n) {
if (feof(self->fp)) {
PyErr_SetNone(PyExc_EOFError);
return -1;