Kaydet (Commit) 7d0ae5e1 authored tarafından Guido van Rossum's avatar Guido van Rossum

Trent Mick: use size_t instead of int where appropriate (in

fromfile(), to hold fread() result.)
üst 2f8a0544
...@@ -1027,7 +1027,7 @@ array_fromfile(self, args) ...@@ -1027,7 +1027,7 @@ array_fromfile(self, args)
if (n > 0) { if (n > 0) {
char *item = self->ob_item; char *item = self->ob_item;
int itemsize = self->ob_descr->itemsize; int itemsize = self->ob_descr->itemsize;
int nread; size_t nread;
int newlength; int newlength;
size_t newbytes; size_t newbytes;
/* Be careful here about overflow */ /* Be careful here about overflow */
...@@ -1045,7 +1045,7 @@ array_fromfile(self, args) ...@@ -1045,7 +1045,7 @@ array_fromfile(self, args)
self->ob_size += n; self->ob_size += n;
nread = fread(item + (self->ob_size - n) * itemsize, nread = fread(item + (self->ob_size - n) * itemsize,
itemsize, n, fp); itemsize, n, fp);
if (nread < n) { if (nread < (size_t)n) {
self->ob_size -= (n - nread); self->ob_size -= (n - nread);
PyMem_RESIZE(item, char, self->ob_size*itemsize); PyMem_RESIZE(item, char, self->ob_size*itemsize);
self->ob_item = item; self->ob_item = item;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment