From 996a7101be97a3dfdc4dd322ffe17a64bf3ba148 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 4 Jul 2010 08:19:07 +0000 Subject: [PATCH] do not query invalid storage ids git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13116 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/library.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index b68f4aceb..0b53052a5 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -4665,7 +4665,7 @@ storage_info_func (CameraFilesystem *fs, PTPParams *params = &camera->pl->params; PTPStorageInfo si; PTPStorageIDs sids; - int i; + int i,n; uint16_t ret; CameraStorageInformation*sif; @@ -4676,11 +4676,15 @@ storage_info_func (CameraFilesystem *fs, ret = ptp_getstorageids (params, &sids); if (ret != PTP_RC_OK) return translate_ptp_result (ret); - *nrofsinfos = sids.n; + n = 0; *sinfos = (CameraStorageInformation*) calloc (sizeof (CameraStorageInformation),sids.n); for (i = 0; i