Fix copy & paste error in tvb_extract_utf_16_string, tvb_extract_ucs_4_string.
authorJakub Zawadzki <darkjames-ws@darkjames.pl>
Tue, 22 Apr 2014 20:27:41 +0000 (22:27 +0200)
committerAnders Broman <a.broman58@gmail.com>
Wed, 23 Apr 2014 04:33:44 +0000 (04:33 +0000)
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>
epan/tvbuff.c

index 4406b948cd1a5d74afb9c84dc62b411c794173ab..de83fddce66e3dc0a57d200a988b8420a40bf19c 100644 (file)
@@ -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);