diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-02-28 22:10:03 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-02-28 22:10:03 +0100 |
| commit | 0ba4073d055be461a6e161face5c3a419dfec6cd (patch) | |
| tree | 4a4bf647f67577fbcf3d44d904b79ad0ec6e63a2 | |
| parent | cd141987f9e18e1adfdb3dfc60b5fc3fe1d637dc (diff) | |
| download | libgphoto2-0ba4073d055be461a6e161face5c3a419dfec6cd.tar.gz | |
fix olc info count detection even more (AFL)
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 30b130108..23f356db3 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -1869,11 +1869,11 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, unsigned int j; entries++; - if (size < 12+2) - break; - for (j=0;j<31;j++) - if (dtoh16a(curdata+12) & (1<<j)) - entries++; + if (size >= 12+2) { + for (j=0;j<31;j++) + if (dtoh16a(curdata+12) & (1<<j)) + entries++; + } } curdata += size; entries++; @@ -2334,12 +2334,14 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, len = dtoh32a(curdata+8); if ((len != size-8) && (len != size-4)) { ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].u.info = strdup("OLC size unexpected"); ptp_debug (params, "event %d: OLC unexpected size %d for blob len %d (not -4 nor -8)", i, size, len); break; } mask = dtoh16a(curdata+8+4); if (size < 14) { ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN; + ce[i].u.info = strdup("OLC size too small"); ptp_debug (params, "event %d: OLC unexpected size %d", i, size); break; } |