diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 18:21:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 18:21:58 +0400 |
| commit | a1cf7988c1d71b5b0a975eff1e5de1d744143606 (patch) | |
| tree | 18b885d0d35b583b2ee7e90eb79ae26675f20fa1 /source/blender/imbuf | |
| parent | 2d40b8d56ff100b71dac7c4694f6115dcc0b01b5 (diff) | |
| parent | 1025b750ee873edee48b03653ab0e6a7988245d0 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928
Sequencer changes from source/blender/src coming next
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/radiance_hdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index d00e34cfdbe..69c4970df38 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -191,7 +191,7 @@ struct ImBuf *imb_loadhdr(unsigned char *mem, int size, int flags) break; } } - if (found) { + if (found && (x<(size + 2))) { if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, (char*)&oriX, &width) != 4) return NULL; |