darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle error return value of ptp_unpack_DPV

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14983 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-06-01 16:04:42 +00:00
parent cce66f1959
commit c869ec5bcd
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
camlibs/ptp2/ptp.c
View File

@@ -1763,7 +1763,13 @@ ptp_getdevicepropvalue (PTPParams* params, uint16_t propcode,
ptp.Nparam=1;
len=offset=0;
ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &dpv, &len);
if (ret == PTP_RC_OK) ptp_unpack_DPV(params, dpv, &offset, len, value, datatype);
if (ret == PTP_RC_OK) {
int ret2 = ptp_unpack_DPV(params, dpv, &offset, len, value, datatype);
if (!ret2) {
ptp_debug (params, "ptp_getdevicepropvalue: unpacking DPV failed");
ret = PTP_RC_GeneralError;
}
}
free(dpv);
return ret;
}
@@ -3676,8 +3682,13 @@ ptp_mtp_getobjectpropvalue (
ptp.Param1 = oid;
ptp.Param2 = opc;
ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size);
if (ret == PTP_RC_OK)
ptp_unpack_DPV(params, data, &offset, size, value, datatype);
if (ret == PTP_RC_OK) {
int ret2 = ptp_unpack_DPV(params, data, &offset, size, value, datatype);
if (!ret2) {
ptp_debug (params, "ptp_mtp_getobjectpropvalue: unpacking DPV failed");
ret = PTP_RC_GeneralError;
}
}
free(data);
return ret;
}