diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-12-13 08:29:27 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-12-13 08:29:27 +0000 |
| commit | f59c42c543626ceb759a0998f03036e91dcaab97 (patch) | |
| tree | 7ae9f6f03c50551958167c1897a9ce740c5eb96b /graphics/libgphoto2 | |
| parent | e43b13212caf8f0b5f5d4ffcbb5ccb79155c725e (diff) | |
| download | ports-f59c42c543626ceb759a0998f03036e91dcaab97.tar.gz ports-f59c42c543626ceb759a0998f03036e91dcaab97.zip | |
- Fix the fix: lofi's patch was using a buffer before initializing it
Obtained from: gphoto SVN rev 9585
Pointy hat to: lofi
Notes
Notes:
svn path=/head/; revision=179639
Diffstat (limited to 'graphics/libgphoto2')
| -rw-r--r-- | graphics/libgphoto2/files/patch-camlibs_canon-usb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c index cccc8bc6f2ec..6a74220cfb88 100644 --- a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c +++ b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c @@ -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)", |