Attachment 951726 Details for Bug 1158234 – Fix int overflow in file I/O

[patch] Fix int overflow in file I/O

rawtherapee-4.1-int-overflow.patch (text/plain), 1.43 KB, created by Daniel Berrangé on 2014-10-29 10:08:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2014-10-29 10:08:15 UTC

Size: 1.43 KB

patch

obsolete

>diff -rup rawtherapee-4.1/rtengine/myfile.cc rawtherapee-4.1.new/rtengine/myfile.cc
>--- rawtherapee-4.1/rtengine/myfile.cc	2014-05-21 14:06:28.000000000 +0100
>+++ rawtherapee-4.1.new/rtengine/myfile.cc	2014-10-29 09:54:53.657575425 +0000
>@@ -317,7 +317,7 @@ int fscanf (IMFILE* f, const char* s ...
>         // were parsed. However, only dcraw.cc code use it and only for "%f" and
>         // "%d", so we make a dummy fscanf here just to support dcraw case.
>         char buf[50], *endptr;
>-        int copy_sz = f->size - f->pos;
>+        ssize_t copy_sz = f->size - f->pos;
>         if (copy_sz > sizeof(buf)) {
>             copy_sz = sizeof(buf) - 1;
>         }
>Only in rawtherapee-4.1.new/rtengine: myfile.cc~
>diff -rup rawtherapee-4.1/rtengine/myfile.h rawtherapee-4.1.new/rtengine/myfile.h
>--- rawtherapee-4.1/rtengine/myfile.h	2014-05-21 14:06:28.000000000 +0100
>+++ rawtherapee-4.1.new/rtengine/myfile.h	2014-10-29 09:54:34.931414125 +0000
>@@ -57,7 +57,7 @@ inline int feof (IMFILE* f) {
> }
> 
> inline void fseek (IMFILE* f, int p, int how) {
>-	int fpos = f->pos;
>+	ssize_t fpos = f->pos;
> 
> 	if (how==SEEK_SET)
> 		f->pos = p;
>@@ -90,7 +90,7 @@ inline int getc (IMFILE* f) {
> inline int fread (void* dst, int es, int count, IMFILE* f) {
> 
> 	int s = es*count;
>-	int avail = f->size - f->pos;
>+	ssize_t avail = f->size - f->pos;
> 	if (s<=avail) {
> 		memcpy (dst, f->data+f->pos, s);
> 		f->pos += s;
>Only in rawtherapee-4.1.new/rtengine: myfile.h~

Actions: View | Diff

Attachments on bug 1158234: 951726