diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-08 08:00:55 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-08 08:00:55 +0000 |
| commit | ec53e7789a034fa12d69129a16de37ba64760e52 (patch) | |
| tree | 907fd2fa67d880c1a09c9790c47c01f21e241eb0 /epan/oids.c | |
| parent | 16849e5cffacb50fb211c79471801799b2f865f3 (diff) | |
| download | wireshark-ec53e7789a034fa12d69129a16de37ba64760e52.tar.gz | |
From Kovarththanan Rajaratnam:
Avoid duplicate blurb/name.
svn path=/trunk/; revision=29014
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/oids.c b/epan/oids.c index 3419bda58f..36a56c9f6c 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -616,13 +616,15 @@ void register_mibs(void) { typedata->display, NULL, 0, -#if !defined _WIN32 || (_MSC_VER == 1200) smiRenderOID(smiNode->oidlen, smiNode->oid, SMI_RENDER_ALL), -#else - g_strdup (smiRenderOID(smiNode->oidlen, smiNode->oid, SMI_RENDER_ALL)), -#endif HFILL }}; + /* Don't allow duplicate blurb/name */ + if (strcmp(hf.hfinfo.blurb, hf.hfinfo.name) == 0) { + smi_free((void *) hf.hfinfo.blurb); + hf.hfinfo.blurb = NULL; + } + oid_data->value_hfid = -1; if ( IS_ENUMABLE(hf.hfinfo.type) && (smiEnum = smiGetFirstNamedNumber(smiType))) { |