darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bufferhandling, we were overwriting unallocated memory in some cases.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7273 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2004-08-09 15:58:16 +00:00
parent 389a64611b
commit 5ccca2f8fb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ricoh/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-08-09 Marcus Meissner <meissner@suse.de>
* g3.c: fixed buffer handling, we were overwriting
unallocated memory with newer libusb.
2004-05-19 Hubert Figuiere <hfiguiere@teaser.fr>
* g3.c (camera_abilities): Camera is Medion MD 6126

8
camlibs/ricoh/g3.c
View File

@@ -69,10 +69,14 @@ g3_channel_read(GPPort *port, int *channel, char **buffer, int *len)
*channel = xbuf[1];
*len = xbuf[4] + (xbuf[5]<<8) + (xbuf[6]<<16) + (xbuf[7]<<24);
/* Safety buffer of 0x800 ... we can only read in 0x800 chunks,
* otherwise the communication gets hickups. However *len might be
* less.
*/
if (!*buffer)
*buffer = malloc(*len + 1);
*buffer = malloc(*len + 1 + 0x800);
else
*buffer = realloc(*buffer, *len + 1);
*buffer = realloc(*buffer, *len + 1 + 0x800);
tocopy = *len;
if (tocopy > 0x800-8) tocopy = 0x800-8;
memcpy(*buffer, xbuf+8, tocopy);