← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libexif/lucid-updates

« back to all changes in this revision

Viewing changes to libexif/olympus/mnote-olympus-tag.c

  • Committer: Bazaar Package Importer
  • Author(s): Nico Golde
  • Date: 2007-12-21 17:13:58 UTC
  • mfrom: (5.1.5 hardy)
  • Revision ID: james.westby@ubuntu.com-20071221171358-zbjzk21kmnizelhk
Tags: 0.6.16-2.1
http://bugs.debian.org/457330
http://bugs.debian.org/457330
* Non-maintainer upload by security team.
* This update addresses the following security issues:
  - possible denial of service attack via crafted
    image file leading to an infinite recursion in the
    exif-loader.c (CVE-2007-6351; Closes: #457330).
  - integer overflow in exif-data.c triggered by a crafted
    image file could lead to arbitrary code execution
    (CVE-2007-6352; Closes: #457330).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libexif/olympus/mnote-olympus-tag.c
34
34
} table[] = {
35
35
 
36
36
        /* Nikon v2 */
37
 
        {MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), NULL},
38
 
        {MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), NULL},
39
 
        {MNOTE_NIKON_TAG_COLORMODE1,   "COLORMODE1", N_("Colormode (?)"), NULL},
40
 
        {MNOTE_NIKON_TAG_QUALITY,      "QUALITY", N_("Quality"), NULL},
41
 
        {MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("Whitebalance"), NULL},
42
 
        {MNOTE_NIKON_TAG_SHARPENING,   "SHARPENING",   N_("Image Sharpening"), NULL},
43
 
        {MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), NULL},
44
 
        {MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), NULL},
45
 
        {MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), NULL},
46
 
        {MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine ajustment"), NULL},
47
 
        {MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("Whitebalance RB"), NULL},
 
37
        {MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), ""},
 
38
        {MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), ""},
 
39
        {MNOTE_NIKON_TAG_COLORMODE1,   "COLORMODE1", N_("Colormode (?)"), ""},
 
40
        {MNOTE_NIKON_TAG_QUALITY,      "QUALITY", N_("Quality"), ""},
 
41
        {MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("Whitebalance"), ""},
 
42
        {MNOTE_NIKON_TAG_SHARPENING,   "SHARPENING",   N_("Image Sharpening"), ""},
 
43
        {MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), ""},
 
44
        {MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), ""},
 
45
        {MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), ""},
 
46
        {MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine ajustment"), ""},
 
47
        {MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("Whitebalance RB"), ""},
48
48
        {MNOTE_NIKON_TAG_UNKNOWN_0X000D,  NULL, NULL, NULL},
49
 
        {MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("Isoselection"), NULL},
50
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X0011,  NULL, NULL, NULL},
51
 
        {MNOTE_NIKON_TAG_EXPOSUREDIFF,    "EXPOSUREDIFF", N_("Exposurediff ?"), NULL},
52
 
        {MNOTE_NIKON_TAG_FLASHCOMPENSATION, "FLASHCOMPENSATION", N_("Flashcompensation ?"), NULL},
53
 
        {MNOTE_NIKON_TAG_ISO2,            "ISO", N_("ISO Setting"), NULL},
54
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X0016,  NULL, NULL, NULL},
 
49
        {MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("Isoselection"), ""},
 
50
        {MNOTE_NIKON_TAG_PREVIEWIMAGE,    "PREVIEWIMAGE", N_("Preview Image"), ""},
 
51
        {MNOTE_NIKON_TAG_EXPOSUREDIFF,    "EXPOSUREDIFF", N_("Exposurediff ?"), ""},
 
52
        {MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION, "FLASHEXPCOMPENSATION", N_("Flash exposure compensation"), ""},
 
53
        {MNOTE_NIKON_TAG_ISO2,            "ISO", N_("ISO Setting"), ""},
 
54
        {MNOTE_NIKON_TAG_IMAGEBOUNDARY,   "IMAGEBOUNDARY", N_("Image Boundary"), ""},
55
55
        {MNOTE_NIKON_TAG_UNKNOWN_0X0017,  NULL, NULL, NULL},
56
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X0018,  NULL, NULL, NULL},
57
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X0019,  NULL, NULL, NULL},
58
 
        {MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), NULL},
59
 
        {MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tonecompensation"), NULL},
60
 
        {MNOTE_NIKON_TAG_ADAPTER,         "Adapter", N_("Adapter"), NULL},
61
 
        {MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lenstype"), NULL},
62
 
        {MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), NULL},
63
 
        {MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), NULL},
64
 
        {MNOTE_NIKON_TAG_DIGITALZOOM,     "DigitalZoom", N_("Digital Zoom"), NULL},
65
 
        {MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), NULL},
66
 
        {MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), NULL},
67
 
        {MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), NULL},
 
56
        {MNOTE_NIKON_TAG_FLASHEXPOSUREBRACKETVAL,  "FLASHEXPOSUREBRACKETVAL", N_("Flash exposure bracket value"), ""},
 
57
        {MNOTE_NIKON_TAG_EXPOSUREBRACKETVAL,  "EXPOSUREBRACKETVAL", N_("Exposure bracket value"), ""},
 
58
        {MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
 
59
        {MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tonecompensation"), ""},
 
60
        {MNOTE_NIKON_TAG_ADAPTER,         "ADAPTER", N_("Adapter"), ""},
 
61
        {MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lenstype"), ""},
 
62
        {MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), ""},
 
63
        {MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), ""},
 
64
        {MNOTE_NIKON_TAG_DIGITALZOOM,     "DigitalZoom", N_("Digital Zoom"), ""},
 
65
        {MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), ""},
 
66
        {MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), ""},
 
67
        {MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), ""},
68
68
        {MNOTE_NIKON_TAG_UNKNOWN_0X008A,  NULL, NULL, NULL},
69
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X008B,  NULL, NULL, NULL},
70
 
        {MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), NULL},
71
 
        {MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), NULL},
72
 
        {MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), NULL},
 
69
        {MNOTE_NIKON_TAG_LENS_FSTOPS,     "LENSFSTOPS", N_("Lens F stops"), ""},
 
70
        {MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), ""},
 
71
        {MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), ""},
 
72
        {MNOTE_NIKON_TAG_LIGHTTYPE,       "LIGHTTYPE,", N_("Lighttype"), ""},
73
73
        {MNOTE_NIKON_TAG_UNKNOWN_0X0091,  NULL, NULL, NULL},
74
 
        {MNOTE_NIKON_TAG_HUE,             "Hue,", N_("Hue Adjustment"), NULL},
75
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X0094,  NULL, NULL, NULL},
76
 
        {MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), NULL},
 
74
        {MNOTE_NIKON_TAG_HUE,             "HUE", N_("Hue Adjustment"), ""},
 
75
        {MNOTE_NIKON_TAG_SATURATION,      "SATURATION", N_("Saturation"), ""},
 
76
        {MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), ""},
77
77
        {MNOTE_NIKON_TAG_UNKNOWN_0X0097,  NULL, NULL, NULL},
78
78
        {MNOTE_NIKON_TAG_UNKNOWN_0X0098,  NULL, NULL, NULL},
79
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X009A,  NULL, NULL, NULL},
 
79
        {MNOTE_NIKON_TAG_SENSORPIXELSIZE, "SENSORPIXELSIZE", N_("Sensor pixel size"), ""},
80
80
        {MNOTE_NIKON_TAG_UNKNOWN_0X009B,  NULL, NULL, NULL},
81
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A0,  NULL, NULL, NULL},
82
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A2,  NULL, NULL, NULL},
 
81
        {MNOTE_NIKON_TAG_SERIALNUMBER,    "SERIALNUMBER", N_("Serial number"), ""},
 
82
        {MNOTE_NIKON_TAG_IMAGE_DATASIZE,  "IMAGEDATASIZE", N_("Image datasize"), N_("Size of compressed image data in bytes.")},
83
83
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A3,  NULL, NULL, NULL},
84
 
        {MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total number of pictures taken"), NULL},
 
84
        {MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total number of pictures taken"), ""},
85
85
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A8,  NULL, NULL, NULL},
86
 
        {MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), NULL},
87
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X00AA,  NULL, NULL, NULL},
88
 
        {MNOTE_NIKON_TAG_UNKNOWN_0X00AB,  NULL, NULL, NULL},
89
 
        {MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), NULL},
90
 
        {MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), NULL},
 
86
        {MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), ""},
 
87
        {MNOTE_NIKON_TAG_SATURATION,      "SATURATION", N_("Saturation"), ""},
 
88
        {MNOTE_NIKON_TAG_VARIPROGRAM,     "VARIPROGRAM", N_("Vari Program"), ""},
 
89
        {MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), ""},
 
90
        {MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), ""},
91
91
        {MNOTE_NIKON_TAG_UNKNOWN_0X0E0E,  NULL, NULL, NULL},
92
92
        {MNOTE_NIKON_TAG_UNKNOWN_0X0E10,  NULL, NULL, NULL},
93
93
        {MNOTE_NIKON1_TAG_UNKNOWN_0X0002, NULL, NULL, NULL},
94
 
        {MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), NULL},
95
 
        {MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Colormode"), NULL},
96
 
        {MNOTE_NIKON1_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), NULL},
97
 
        {MNOTE_NIKON1_TAG_CCDSENSITIVITY, "CCDSensitivity", N_("CCD Sensitivity"), NULL},
98
 
        {MNOTE_NIKON1_TAG_WHITEBALANCE,   "WhiteBalance", N_("Whitebalance"), NULL},
99
 
        {MNOTE_NIKON1_TAG_FOCUS,          "Focus", N_("Focus"), NULL},
 
94
        {MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), ""},
 
95
        {MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Colormode"), ""},
 
96
        {MNOTE_NIKON1_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
 
97
        {MNOTE_NIKON1_TAG_CCDSENSITIVITY, "CCDSensitivity", N_("CCD Sensitivity"), ""},
 
98
        {MNOTE_NIKON1_TAG_WHITEBALANCE,   "WhiteBalance", N_("Whitebalance"), ""},
 
99
        {MNOTE_NIKON1_TAG_FOCUS,          "Focus", N_("Focus"), ""},
100
100
        {MNOTE_NIKON1_TAG_UNKNOWN_0X0009, NULL, NULL, NULL},
101
 
        {MNOTE_NIKON1_TAG_DIGITALZOOM,    "DigitalZoom", N_("Digital Zoom"), NULL},
102
 
        {MNOTE_NIKON1_TAG_CONVERTER,      "Converter", N_("Converter"), NULL},
 
101
        {MNOTE_NIKON1_TAG_DIGITALZOOM,    "DigitalZoom", N_("Digital Zoom"), ""},
 
102
        {MNOTE_NIKON1_TAG_CONVERTER,      "Converter", N_("Converter"), ""},
103
103
 
104
104
        /* Olympus */
105
 
        {MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), NULL},
106
 
        {MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), NULL},
107
 
        {MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), NULL},
 
105
        {MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), ""},
 
106
        {MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), ""},
 
107
        {MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), ""},
108
108
        {MNOTE_OLYMPUS_TAG_UNKNOWN_1, NULL, NULL, NULL},
109
 
        {MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), NULL},
 
109
        {MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""},
110
110
        {MNOTE_OLYMPUS_TAG_UNKNOWN_2, NULL, NULL, NULL},
111
111
        {MNOTE_OLYMPUS_TAG_UNKNOWN_3, NULL, NULL, NULL},
112
 
        {MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), NULL},
113
 
        {MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), NULL},
114
 
        {MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), NULL},
 
112
        {MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), ""},
 
113
        {MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), ""},
 
114
        {MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), ""},
115
115
        {MNOTE_OLYMPUS_TAG_UNKNOWN_4, NULL, NULL, NULL},
116
 
        {MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), NULL},
117
 
        {MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), NULL},
118
 
        {MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), NULL},
119
 
        {MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), NULL},
120
 
        {MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), NULL},
121
 
        {MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), NULL},
 
116
        {MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), ""},
 
117
        {MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
 
118
        {MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), ""},
 
119
        {MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), ""},
 
120
        {MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), ""},
 
121
        {MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), ""},
122
122
        {0, NULL, NULL, NULL}
123
123
};
124
124