mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

- Fix the fix: lofi's patch was using a buffer before initializing it

Browse Source 
Obtained from:	gphoto SVN rev 9585
Pointy hat to:	lofi
This commit is contained in:
Pav Lucistnik 2006-12-13 08:29:27 +00:00
parent e43b13212c
commit f59c42c543
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=179639
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/libgphoto2/files/patch-camlibs_canon-usb.c
View File

@ -1,18 +1,19 @@
--- camlibs/canon/usb.c.orig Tue Dec 12 19:09:39 2006
+++ camlibs/canon/usb.c Tue Dec 12 19:10:26 2006
--- camlibs/canon/usb.c.orig Sat Nov 25 15:47:24 2006
+++ camlibs/canon/usb.c Wed Dec 13 09:28:25 2006
@@ -1308,6 +1308,7 @@
int j, canon_subfunc = 0;
char subcmd = 0, *subfunct_descr = "";
int additional_read_bytes = 0;
+ char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
+ char *msg;
/* clear this to indicate that no data is there if we abort */
if (return_length)
@@ -1546,7 +1547,6 @@
@@ -1546,7 +1547,7 @@
}
}
- char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
+ msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
if ( msg != NULL ) {
GP_DEBUG ( "canon_usb_dialogue_full: camera status \"%s\""
" in response to command 0x%x 0x%x 0x%x (%s)",