diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 6a1ebe8bd..e62bb02e1 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -1,3 +1,7 @@ +2007-01-10 Marcus Meissner + + * library.c: Added NULL check in MTP objlist reader. + 2007-01-06 Marcus Meissner * library.c, ptp.c, ptp.h, ptp-private.h, usb.c: diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index f76a9ae77..d58b9969c 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -3607,6 +3607,12 @@ init_ptp_fs (Camera *camera, GPContext *context) xpl = proplist; i = -1; while (xpl) { if (lasthandle != xpl->ObjectHandle) { + if (i >= 0) { + if (!oinfos[i].Filename) { + /* i have one such file on my Creative */ + oinfos[i].Filename = strdup(""); + } + } i++; lasthandle = xpl->ObjectHandle; params->handles.Handler[i] = xpl->ObjectHandle;