diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-05 08:37:47 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-05 08:37:47 +0000 |
| commit | b3cd1eb8d74a31ba2bc5ee1ed49dce6402b1ed59 (patch) | |
| tree | e26f5e50c2ba92bf15cc7df61fc5703ef6cee728 | |
| parent | 89a2075b73dccd7befd9fd83dde3e2bc7b4a7715 (diff) | |
From Jan Kratochvil: fix MMSE handling of strings with specified
character set.
svn path=/trunk/; revision=5951
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | packet-mmse.c | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -1351,6 +1351,10 @@ Hidetaka Ogawa <ogawa[AT]bs2.qnes.nec.co.jp> { present } +Jan Kratochvil <short[AT]ucw.cz> { + Fix to MMSE handling of strings with specified character set +} + Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index ee8e2958ff..216b5c1b6e 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1465,6 +1465,7 @@ B<http://www.ethereal.com>. Jim McDonough <jmcd[AT]us.ibm.com> Sergei Shokhor <sshokhor[AT]uroam.com> Hidetaka Ogawa <ogawa[AT]bs2.qnes.nec.co.jp> + Jan Kratochvil <short[AT]ucw.cz> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-mmse.c b/packet-mmse.c index b2fa2b62e7..ccd5b4a59b 100644 --- a/packet-mmse.c +++ b/packet-mmse.c @@ -2,7 +2,7 @@ * Routines for MMS Message Encapsulation dissection * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl> * - * $Id: packet-mmse.c,v 1.14 2002/08/02 23:35:54 jmayer Exp $ + * $Id: packet-mmse.c,v 1.15 2002/08/05 08:37:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -263,7 +263,7 @@ get_encoded_strval(tvbuff_t *tvb, guint offset, char *strval) /* \todo Something with "Char-set", skip for now */ tvb_memcpy(tvb, strval, offset + count + 1, length - 1); strval[length - 1] = '\0'; /* Just to make sure */ - return offset + count + length; + return count + length; } else return get_text_string(tvb, offset, strval); } |