#945 segfault if CF card is absent

[Thomas Tanner]

gphoto 2.5.1.1 segfaults on "--summary" in ptpc:1880 ptp_canon_eos_getobjectinfoex
if there is no CF card in a Canon 30D.
The following patch fixes the bug:

--- camlibs/ptp2/ptp.c.orig 2013-03-26 00:21:09.000000000 +0100
+++ camlibs/ptp2/ptp.c 2013-03-26 00:11:55.000000000 +0100
@@ -1877,6 +1877,10 @@
if (ret != PTP_RC_OK)
return ret;

• if (!data) {
• *nrofentries = 0;
• return PTP_RC_OK;
• }
  nrofentries = dtoh32a(data);
  entries = malloc(nrofentries * sizeof(PTPCANONFolderEntry));
  if (!entries)

[Marcus Meissner]

applied, thanks!

did not see it on the EOS 1000D

[Marcus Meissner]

is fixed in 2.5.2