diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2014-04-22 22:27:41 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-23 04:33:44 +0000 |
| commit | 9c8febde679e9e19fd3108cb4054496b37f2feec (patch) | |
| tree | fc281c15816480daf6597fde4530da41bb8e4c54 /epan/tvbuff.c | |
| parent | 490a8a6148bf6424409e72c48541ffcb98e2b3c7 (diff) | |
Fix copy & paste error in tvb_extract_utf_16_string, tvb_extract_ucs_4_string.
Use proper p{le,n}toh16 macro depending on endianess.
Change-Id: I8323e4296ec88e2cb24f54a1d8dc89328edb1957
Reviewed-on: https://code.wireshark.org/review/1285
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 4406b948cd..de83fddce6 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2375,7 +2375,7 @@ tvb_extract_utf_16_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint off for(i = 0; i + 1 < length; i += 2) { if (encoding == ENC_BIG_ENDIAN) - uchar2 = pletoh16(ptr + i); + uchar2 = pntoh16(ptr + i); else uchar2 = pletoh16(ptr + i); @@ -2397,7 +2397,7 @@ tvb_extract_utf_16_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint off } lead_surrogate = uchar2; if (encoding == ENC_BIG_ENDIAN) - uchar2 = pletoh16(ptr + i); + uchar2 = pntoh16(ptr + i); else uchar2 = pletoh16(ptr + i); if (IS_TRAIL_SURROGATE(uchar2)) { @@ -2484,7 +2484,7 @@ tvb_extract_ucs_4_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offs for(i = 0; i + 3 < length; i += 4) { if (encoding == ENC_BIG_ENDIAN) - uchar = pletoh16(ptr + i); + uchar = pntoh16(ptr + i); else uchar = pletoh16(ptr + i); |