Menu
▾
▴
libexif-cvs
|
From: Jan P. <pa...@us...> - 2005-08-27 10:30:21
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv707/libexif/canon Modified Files: mnote-canon-entry.c mnote-canon-tag.c Log Message: Fix of changes from beginning of this week: * Canon mnote: Both parts of Settings had indices shifted by 1. entries[] must have secondary sorting by value which is unsigned. Wrong # of items in Settings: reading beyond allocated memory, crashes. Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- mnote-canon-tag.c 24 Aug 2005 18:15:52 -0000 1.7 +++ mnote-canon-tag.c 27 Aug 2005 10:30:10 -0000 1.8 @@ -47,38 +47,38 @@ static struct { unsigned int subtag; const char *name; } table_sub[] = { - {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Macro mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Self time")}, - {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Quality")}, - {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Flash mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 5, N_("Continuous drive mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 7, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Image size")}, - {MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Easy shooting mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Contrast")}, - {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Saturation")}, - {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("Sharpness")}, - {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("ISO")}, - {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Metering mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("Focus type")}, - {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("AF point selected")}, - {MNOTE_CANON_TAG_SETTINGS_1, 20, N_("Exposure mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Lens type")}, - {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Long focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Short focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Focal units per mm")}, - {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Maximal aperture")}, - {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash activity")}, - {MNOTE_CANON_TAG_SETTINGS_1, 29, N_("Flash details")}, - {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution")}, - {MNOTE_CANON_TAG_SETTINGS_1, 37, N_("Zoomed resolution base")}, - {MNOTE_CANON_TAG_SETTINGS_1, 42, N_("Color tone")}, - {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, - {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, - {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, - {MNOTE_CANON_TAG_SETTINGS_2, 15, N_("Flash bias")}, - {MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Subject distance")}, + {MNOTE_CANON_TAG_SETTINGS_1, 0, N_("Macro mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Self time")}, + {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Quality")}, + {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Flash mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Continuous drive mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 6, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 9, N_("Image size")}, + {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Easy shooting mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 12, N_("Contrast")}, + {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Saturation")}, + {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Sharpness")}, + {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("ISO")}, + {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("Metering mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Focus type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("AF point selected")}, + {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("Exposure mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 21, N_("Lens type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Long focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Short focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Focal units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Maximal aperture")}, + {MNOTE_CANON_TAG_SETTINGS_1, 27, N_("Flash activity")}, + {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash details")}, + {MNOTE_CANON_TAG_SETTINGS_1, 31, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 35, N_("Zoomed resolution")}, + {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution base")}, + {MNOTE_CANON_TAG_SETTINGS_1, 41, N_("Color tone")}, + {MNOTE_CANON_TAG_SETTINGS_2, 6, N_("White balance")}, + {MNOTE_CANON_TAG_SETTINGS_2, 8, N_("Sequence number")}, + {MNOTE_CANON_TAG_SETTINGS_2, 13, N_("AF point used")}, + {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("Flash bias")}, + {MNOTE_CANON_TAG_SETTINGS_2, 18, N_("Subject distance")}, {0, 0, NULL} }; Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- mnote-canon-entry.c 24 Aug 2005 18:15:52 -0000 1.12 +++ mnote-canon-entry.c 27 Aug 2005 10:30:10 -0000 1.13 @@ -32,9 +32,6 @@ /* #define DEBUG */ -#undef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - #define CF(format,target,v,maxlen) \ { \ if (format != target) { \ @@ -74,127 +71,129 @@ static struct { ExifShort value; char *name; } entries [] = { - { 1, 1, N_("macro")}, - { 1, 2, N_("normal")}, - { 4, 0, N_("flash did not fire")}, - { 4, 1, N_("auto")}, - { 4, 2, N_("on")}, - { 4, 3, N_("red eyes reduction")}, - { 4, 4, N_("slow synchro")}, - { 4, 5, N_("auto + red yes reduction")}, - { 4, 6, N_("on + red eyes reduction")}, - { 4, 16, N_("external")}, - { 5, 0, N_("single or timer")}, - { 5, 1, N_("continuous")}, - { 7, 0, N_("one-Shot")}, - { 7, 1, N_("AI Servo")}, - { 7, 2, N_("AI Focus")}, - { 7, 3, N_("MF")}, - { 7, 4, N_("Single")}, - { 7, 5, N_("Continuous")}, - { 7, 6, N_("MF")}, - {10, 0, N_("large")}, - {10, 1, N_("medium")}, - {10, 2, N_("small")}, - {11, 0, N_("full auto")}, - {11, 1, N_("manual")}, - {11, 2, N_("landscape")}, - {11, 3, N_("fast shutter")}, - {11, 4, N_("slow shutter")}, - {11, 5, N_("night")}, - {11, 6, N_("Black & White")}, - {11, 7, N_("Sepia")}, - {11, 8, N_("Portrait")}, - {11, 9, N_("Sports")}, - {11, 10, N_("Macro / Close-Up")}, - {11, 11, N_("Pan Focus")}, - {13, 0xffff, N_("low")}, + { 0, 1, N_("macro")}, + { 0, 2, N_("normal")}, + { 3, 0, N_("flash did not fire")}, + { 3, 1, N_("auto")}, + { 3, 2, N_("on")}, + { 3, 3, N_("red eyes reduction")}, + { 3, 4, N_("slow synchro")}, + { 3, 5, N_("auto + red yes reduction")}, + { 3, 6, N_("on + red eyes reduction")}, + { 3, 16, N_("external")}, + { 4, 0, N_("single or timer")}, + { 4, 1, N_("continuous")}, + { 6, 0, N_("one-Shot")}, + { 6, 1, N_("AI Servo")}, + { 6, 2, N_("AI Focus")}, + { 6, 3, N_("MF")}, + { 6, 4, N_("Single")}, + { 6, 5, N_("Continuous")}, + { 6, 6, N_("MF")}, + { 9, 0, N_("large")}, + { 9, 1, N_("medium")}, + { 9, 2, N_("small")}, + {10, 0, N_("full auto")}, + {10, 1, N_("manual")}, + {10, 2, N_("landscape")}, + {10, 3, N_("fast shutter")}, + {10, 4, N_("slow shutter")}, + {10, 5, N_("night")}, + {10, 6, N_("Black & White")}, + {10, 7, N_("Sepia")}, + {10, 8, N_("Portrait")}, + {10, 9, N_("Sports")}, + {10, 10, N_("Macro / Close-Up")}, + {10, 11, N_("Pan Focus")}, + {12, 0x0000, N_("normal")}, + {12, 0x0001, N_("high")}, + {12, 0xffff, N_("low")}, {13, 0x0000, N_("normal")}, {13, 0x0001, N_("high")}, - {14, 0xffff, N_("low")}, + {13, 0xffff, N_("low")}, {14, 0x0000, N_("normal")}, {14, 0x0001, N_("high")}, - {15, 0xffff, N_("low")}, - {15, 0x0000, N_("normal")}, - {15, 0x0001, N_("high")}, - {16, 15, N_("auto")}, - {16, 16, N_("50")}, - {16, 17, N_("100")}, - {16, 18, N_("200")}, - {16, 19, N_("400")}, - {17, 3, N_("evaluative")}, - {17, 4, N_("partial")}, - {17, 5, N_("center-weighted")}, - {19, 0x3000, N_("none (manual focus)")}, - {19, 0x3001, N_("auto-selected")}, - {19, 0x3002, N_("right")}, - {19, 0x3003, N_("center")}, - {19, 0x3004, N_("left")}, - {20, 0, N_("easy shooting")}, - {20, 1, N_("program")}, - {20, 2, N_("Tv-priority")}, - {20, 3, N_("Av-priority")}, - {20, 4, N_("manual")}, - {20, 5, N_("A-DEP")}, - {22, 0x001, N_("Canon EF 50mm f/1.8")}, - {22, 0x002, N_("Canon EF 28mm f/2.8")}, - {22, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")}, - {22, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")}, - {22, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, - {22, 0x011, N_("Canon EF 35mm f/2")}, - {22, 0x013, N_("Canon EF 15mm f/2.8")}, - {22, 0x021, N_("Canon EF 80-200mm f/2.8L")}, - {22, 0x026, N_("Cosina 100mm f/3.5 Macro AF")}, - {22, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, - {22, 0x029, N_("Canon EF 50mm f/1.8 MkII")}, - {22, 0x039, N_("Canon EF 75-300mm f/4-5.6")}, - {22, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")}, - {22, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, - {22, 0x125, N_("Canon TS-E 24mm f/3.5L")}, - {22, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, - {22, 0x135, N_("Canon EF 200mm f/1.8L")}, - {22, 0x136, N_("Canon EF 300mm f/2.8L")}, - {22, 0x139, N_("Canon EF 400mm f/2.8L")}, - {22, 0x141, N_("Canon EF 500mm f/4.5L")}, - {22, 0x149, N_("Canon EF 100mm f/2")}, - {22, 0x150, N_("Sigma 20mm EX f/1.8")}, - {22, 0x151, N_("Canon EF 200mm f/2.8L")}, - {22, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")}, - {22, 0x155, N_("Canon EF 85mm f/1.8 USM")}, - {22, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")}, - {22, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")}, - {22, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")}, - {22, 0x165, N_("Canon EF 70-200mm f/2.8 L")}, - {22, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")}, - {22, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")}, - {22, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")}, - {22, 0x170, N_("Canon EF 200mm f/2.8L II")}, - {22, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")}, - {22, 0x174, N_("Canon EF 135mm f/2L")}, - {22, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")}, - {22, 0x177, N_("Canon EF 300mm f/4L IS")}, - {22, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")}, - {22, 0x180, N_("Canon EF 35mm f/1.4L")}, - {22, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")}, - {22, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")}, - {22, 0x186, N_("Canon EF 70-200mm f/4L")}, - {22, 0x190, N_("Canon EF 100mm f/2.8 Macro")}, - {22, 0x191, N_("Canon EF 400mm f/4 DO IS")}, - {22, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")}, - {22, 0x198, N_("Canon EF 50mm f/1.4")}, - {22, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")}, - {22, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")}, - {22, 0x229, N_("Canon EF 16-35mm f/2.8L")}, - {22, 0x230, N_("Canon EF 24-70mm f/2.8L")}, - {22, 0x231, N_("Canon EF 17-40mm f/4L")}, - {32, 0, N_("single")}, - {32, 1, N_("continuous")}, + {14, 0xffff, N_("low")}, + {15, 15, N_("auto")}, + {15, 16, N_("50")}, + {15, 17, N_("100")}, + {15, 18, N_("200")}, + {15, 19, N_("400")}, + {16, 3, N_("evaluative")}, + {16, 4, N_("partial")}, + {16, 5, N_("center-weighted")}, + {18, 0x3000, N_("none (manual focus)")}, + {18, 0x3001, N_("auto-selected")}, + {18, 0x3002, N_("right")}, + {18, 0x3003, N_("center")}, + {18, 0x3004, N_("left")}, + {19, 0, N_("easy shooting")}, + {19, 1, N_("program")}, + {19, 2, N_("Tv-priority")}, + {19, 3, N_("Av-priority")}, + {19, 4, N_("manual")}, + {19, 5, N_("A-DEP")}, + {21, 0x001, N_("Canon EF 50mm f/1.8")}, + {21, 0x002, N_("Canon EF 28mm f/2.8")}, + {21, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")}, + {21, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")}, + {21, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, + {21, 0x011, N_("Canon EF 35mm f/2")}, + {21, 0x013, N_("Canon EF 15mm f/2.8")}, + {21, 0x021, N_("Canon EF 80-200mm f/2.8L")}, + {21, 0x026, N_("Cosina 100mm f/3.5 Macro AF")}, + {21, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, + {21, 0x029, N_("Canon EF 50mm f/1.8 MkII")}, + {21, 0x039, N_("Canon EF 75-300mm f/4-5.6")}, + {21, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")}, + {21, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, + {21, 0x125, N_("Canon TS-E 24mm f/3.5L")}, + {21, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, + {21, 0x135, N_("Canon EF 200mm f/1.8L")}, + {21, 0x136, N_("Canon EF 300mm f/2.8L")}, + {21, 0x139, N_("Canon EF 400mm f/2.8L")}, + {21, 0x141, N_("Canon EF 500mm f/4.5L")}, + {21, 0x149, N_("Canon EF 100mm f/2")}, + {21, 0x150, N_("Sigma 20mm EX f/1.8")}, + {21, 0x151, N_("Canon EF 200mm f/2.8L")}, + {21, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")}, + {21, 0x155, N_("Canon EF 85mm f/1.8 USM")}, + {21, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")}, + {21, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")}, + {21, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")}, + {21, 0x165, N_("Canon EF 70-200mm f/2.8 L")}, + {21, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")}, + {21, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")}, + {21, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")}, + {21, 0x170, N_("Canon EF 200mm f/2.8L II")}, + {21, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")}, + {21, 0x174, N_("Canon EF 135mm f/2L")}, + {21, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")}, + {21, 0x177, N_("Canon EF 300mm f/4L IS")}, + {21, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")}, + {21, 0x180, N_("Canon EF 35mm f/1.4L")}, + {21, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")}, + {21, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")}, + {21, 0x186, N_("Canon EF 70-200mm f/4L")}, + {21, 0x190, N_("Canon EF 100mm f/2.8 Macro")}, + {21, 0x191, N_("Canon EF 400mm f/4 DO IS")}, + {21, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")}, + {21, 0x198, N_("Canon EF 50mm f/1.4")}, + {21, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")}, + {21, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")}, + {21, 0x229, N_("Canon EF 16-35mm f/2.8L")}, + {21, 0x230, N_("Canon EF 24-70mm f/2.8L")}, + {21, 0x231, N_("Canon EF 17-40mm f/4L")}, + {31, 0, N_("single")}, + {31, 1, N_("continuous")}, { 0, 0, NULL} }; unsigned int mnote_canon_entry_count_values (const MnoteCanonEntry *entry) { + unsigned int val; + if (!entry) return 0; switch (entry->tag) { @@ -202,7 +201,10 @@ mnote_canon_entry_count_values (const Mn case MNOTE_CANON_TAG_SETTINGS_2: case MNOTE_CANON_TAG_CUSTOM_FUNCS: if (entry->format != EXIF_FORMAT_SHORT) return 0; - return exif_get_short (entry->data, entry->order) / 2; + + val = exif_get_short (entry->data, entry->order); + /* val is buffer size, i.e. # of values plus 1 */ + return MIN (entry->size - 2, val) / 2; default: return 1; } @@ -230,23 +232,21 @@ mnote_canon_entry_get_value (const Mnote CC (entry->components, n, val, maxlen); vs = exif_get_short (entry->data + 2 + t * 2, entry->order); switch (t) { - case 0: - break; - case 2: + case 1: if (!vs) break; snprintf (buf, sizeof (buf), _("%i (ms)"), vs * 100); strncpy (val, buf, maxlen - strlen (val)); break; + case 22: case 23: - case 24: snprintf (buf, sizeof (buf), "%u", vs); strncpy (val, buf, maxlen - strlen (val)); break; - case 25: + case 24: snprintf (buf, sizeof (buf), _("%u mm"), vs); strncpy (val, buf, maxlen - strlen(val)); break; - case 29: + case 28: if ((vs >> 14) & 1) strncpy (val, _("External E-TTL"), maxlen - strlen (val)); if ((vs >> 13) & 1) @@ -278,7 +278,7 @@ mnote_canon_entry_get_value (const Mnote CC (entry->components, n, val, maxlen); vs = exif_get_short (entry->data + 2 + t * 2, entry->order); switch (t) { - case 7: + case 6: switch (vs) { case 0: strncpy (val, _("Auto"), maxlen - strlen (val)); @@ -306,11 +306,11 @@ mnote_canon_entry_get_value (const Mnote strncpy (val, buf, maxlen - strlen (val)); } break; - case 9: + case 8: snprintf (buf, sizeof (buf), "%u", vs); strncpy (val, buf, maxlen - strlen (val)); break; - case 14: + case 13: if (vs >> 12) { if (vs & 1) strncpy (val, _("right"), maxlen - strlen (val)); @@ -325,11 +325,11 @@ mnote_canon_entry_get_value (const Mnote strncat (val, buf, maxlen - strlen (val)); } break; - case 15: + case 14: snprintf (buf, sizeof (buf), _("%.2f EV"), vs / 32.); strncpy (val, buf, maxlen - strlen (val)); break; - case 19: + case 18: snprintf (buf, sizeof (buf), _("%u mm"), vs); strncpy (val, buf, maxlen - strlen (val)); break; |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X