diff options
Diffstat (limited to 'mtp/mtp_MtpDatabase.cpp')
| -rwxr-xr-x | mtp/mtp_MtpDatabase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mtp/mtp_MtpDatabase.cpp b/mtp/mtp_MtpDatabase.cpp index 60a871ce3..acdab523d 100755 --- a/mtp/mtp_MtpDatabase.cpp +++ b/mtp/mtp_MtpDatabase.cpp @@ -322,7 +322,7 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyValue(MtpObjectHandle handle, MtpDataPacket& packet) { MTPD("MyMtpDatabase::getObjectPropertyValue mtpid: %i, property: %x\n", handle, property); int type; - MtpResponseCode result; + MtpResponseCode result = MTP_RESPONSE_INVALID_OBJECT_HANDLE; uint64_t longValue; if (!getObjectPropertyInfo(property, type)) { MTPE("MyMtpDatabase::setObjectPropertyValue returning MTP_RESPONSE_OBJECT_PROP_NOT_SUPPORTED\n"); @@ -336,6 +336,11 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyValue(MtpObjectHandle handle, } } + if (result != MTP_RESPONSE_OK) { + MTPE("MyMtpDatabase::setObjectPropertyValue unable to locate handle: %i\n", handle); + return MTP_RESPONSE_INVALID_OBJECT_HANDLE; + } + // special case date properties, which are strings to MTP // but stored internally as a uint64 if (property == MTP_PROPERTY_DATE_MODIFIED || property == MTP_PROPERTY_DATE_ADDED) { |