diff options
| author | Anders Broman <a.broman58@gmail.com> | 2015-02-12 08:33:02 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-12 08:34:05 +0000 |
| commit | 53228c4bd8d64dae077c90496da738c0da75f20f (patch) | |
| tree | dcd8a243e2e7cc228af511678dc4d93eade9f8bc /epan/address_types.c | |
| parent | 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac (diff) | |
| download | wireshark-53228c4bd8d64dae077c90496da738c0da75f20f.tar.gz | |
Revert "Make get_manuf_name return a const string."
This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac.
Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4
Reviewed-on: https://code.wireshark.org/review/7076
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/address_types.c')
| -rw-r--r-- | epan/address_types.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/address_types.c b/epan/address_types.c index 4c447c6a94..61d3f52a2d 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -429,7 +429,7 @@ static gboolean fcwwn_to_str(const address* addr, gchar *buf, int buf_len) const guint8 *addrp = (const guint8*)addr->data; int fmt; guint8 oui[6]; - gchar *ethptr; + gchar *ethptr, *manuf_name; if (buf_len < 200) { /* This is mostly for manufacturer name */ g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ @@ -444,7 +444,9 @@ static gboolean fcwwn_to_str(const address* addr, gchar *buf, int buf_len) case FC_NH_NAA_IEEE_E: memcpy (oui, &addrp[2], 6); - g_snprintf (ethptr, buf_len-23, " (%s)", get_manuf_name(oui)); + manuf_name = get_manuf_name(NULL, oui); + g_snprintf (ethptr, buf_len-23, " (%s)", manuf_name); + wmem_free(NULL, manuf_name); break; case FC_NH_NAA_IEEE_R: @@ -455,7 +457,9 @@ static gboolean fcwwn_to_str(const address* addr, gchar *buf, int buf_len) oui[4] = ((addrp[4] & 0x0F) << 4) | ((addrp[5] & 0xF0) >> 4); oui[5] = ((addrp[5] & 0x0F) << 4) | ((addrp[6] & 0xF0) >> 4); - g_snprintf (ethptr, buf_len-23, " (%s)", get_manuf_name(oui)); + manuf_name = get_manuf_name(NULL, oui); + g_snprintf (ethptr, buf_len-23, " (%s)", manuf_name); + wmem_free(NULL, manuf_name); break; default: |