Temporarily revert r52651 it caused a regression when trying to tvb_memcpy from

a negative offset (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9277)

svn path=/trunk/; revision=52658

1 files changed, 15 insertions, 22 deletions

diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 43deee7b16..b967e81f11 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -709,23 +709,6 @@ guint8_pbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles, g
 
 /************** ACCESSORS **************/
 
-inline static void *
-_tvb_memcpy(tvbuff_t *tvb, void *target, guint abs_offset, guint abs_length)
-{
-	if (tvb->real_data) {
-		return memcpy(target, tvb->real_data + abs_offset, abs_length);
-	}
-
-	if (tvb->ops->tvb_memcpy)
-		return tvb->ops->tvb_memcpy(tvb, target, abs_offset, abs_length);
-
-	/* XXX, fallback to slower method */
-
-	DISSECTOR_ASSERT_NOT_REACHED();
-	return NULL;
-
-}
-
 void *
 tvb_memcpy(tvbuff_t *tvb, void *target, const gint offset, size_t length)
 {
@@ -747,7 +730,17 @@ tvb_memcpy(tvbuff_t *tvb, void *target, const gint offset, size_t length)
 	DISSECTOR_ASSERT(length <= 0x7FFFFFFF);
 	check_offset_length(tvb, offset, (gint) length, &abs_offset, &abs_length);
 
-	return _tvb_memcpy(tvb, target, abs_offset, abs_length);
+	if (tvb->real_data) {
+		return memcpy(target, tvb->real_data + abs_offset, abs_length);
+	}
+
+	if (tvb->ops->tvb_memcpy)
+		return tvb->ops->tvb_memcpy(tvb, target, abs_offset, abs_length);
+
+	/* XXX, fallback to slower method */
+
+	DISSECTOR_ASSERT_NOT_REACHED();
+	return NULL;
 }
 
 
@@ -777,7 +770,7 @@ tvb_memdup(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, size_t len
 	check_offset_length(tvb, offset, (gint) length, &abs_offset, &abs_length);
 
 	duped = wmem_alloc(scope, abs_length);
-	return _tvb_memcpy(tvb, duped, abs_offset, abs_length);
+	return tvb_memcpy(tvb, duped, abs_offset, abs_length);
 }
 
 
@@ -1216,7 +1209,7 @@ tvb_get_ntohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
 	guid->data1 = tvb_get_ntohl(tvb, offset);
 	guid->data2 = tvb_get_ntohs(tvb, offset + 4);
 	guid->data3 = tvb_get_ntohs(tvb, offset + 6);
-	_tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
+	tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
 }
 
 void
@@ -1226,7 +1219,7 @@ tvb_get_letohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
 	guid->data1 = tvb_get_letohl(tvb, offset);
 	guid->data2 = tvb_get_letohs(tvb, offset + 4);
 	guid->data3 = tvb_get_letohs(tvb, offset + 6);
-	_tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
+	tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
 }
 
 /*
@@ -1921,7 +1914,7 @@ tvb_get_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, const
 
 	tvb_ensure_bytes_exist(tvb, offset, length); /* make sure length = -1 fails */
 	strbuf = (guint8 *)wmem_alloc(scope, length + 1);
-	_tvb_memcpy(tvb, strbuf, offset, length);
+	tvb_memcpy(tvb, strbuf, offset, length);
 	strbuf[length] = '\0';
 	return strbuf;
 }