From c81cbe1842246645664f8093f207df962e09c562 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 16 Jun 2010 18:28:28 +0000
Subject: [PATCH] Go back to 64-bit sizes, but, before passing those sizes to
 g_try_malloc() or g_try_realloc(), check whether they fit in a gsize and:

	if not, just pretend the allocation failed;

	if so, cast them to gsize to squelch compiler warnings.

svn path=/trunk/; revision=33239
---
 epan/dissectors/packet-smb.h |  2 +-
 gtk/export_object_smb.c      | 36 +++++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index a8976777bd..dea3c0cb67 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -189,7 +189,7 @@ typedef struct _smb_eo_t {
         gchar   *content_type;
         guint32  payload_len;
         const guint8 *payload_data;
-        gsize   smb_file_offset;
+        guint64 smb_file_offset;
         guint32 smb_chunk_len;
 } smb_eo_t;
 
diff --git a/gtk/export_object_smb.c b/gtk/export_object_smb.c
index a56188daf4..4f1dd34331 100644
--- a/gtk/export_object_smb.c
+++ b/gtk/export_object_smb.c
@@ -123,11 +123,11 @@ void insert_chunk(active_file   *file, export_object_entry_t *entry, const smb_e
 	guint		i;
         free_chunk      *current_free_chunk;
         free_chunk      *new_free_chunk;
-        gsize           chunk_offset=eo_info->smb_file_offset;
-        gsize           chunk_length=eo_info->payload_len;
-        gsize           chunk_end_offset = chunk_offset+chunk_length-1;
+	guint64 	chunk_offset=eo_info->smb_file_offset;
+	guint64 	chunk_length=eo_info->payload_len;
+        guint64         chunk_end_offset = chunk_offset+chunk_length-1;
 	/* Size of file in memory */
-        gsize           calculated_size = chunk_offset+chunk_length;	
+        guint64         calculated_size = chunk_offset+chunk_length;	
 	gpointer	dest_memory_addr;
 
 	/* Let's recalculate the file length and data gathered */
@@ -196,7 +196,17 @@ void insert_chunk(active_file   *file, export_object_entry_t *entry, const smb_e
 	   ...first, we shall be able to allocate the memory */
 	if (!entry->payload_data) {
 		/* This is a New file */
-		entry->payload_data = g_try_malloc(calculated_size);
+		if (calculated_size > G_MAXSIZE) {
+			/*
+			 * The argument to g_try_malloc() is
+			 * a gsize, the maximum value of which is
+			 * G_MAXSIZE.  If the calculated size is
+			 * bigger than that, we just say the attempt
+			 * to allocate memory failed.
+			 */
+			entry->payload_data=NULL;
+		} else
+			entry->payload_data = g_try_malloc((gsize)calculated_size);
 		if (!entry->payload_data) {
 			/* Memory error */
 			file->is_out_of_memory=TRUE;
@@ -206,13 +216,21 @@ void insert_chunk(active_file   *file, export_object_entry_t *entry, const smb_e
 		if (calculated_size > (guint64) entry->payload_len &&
 		    !file->is_out_of_memory) { 
 			/* We need more memory */
-			dest_memory_addr=g_try_realloc(
-				entry->payload_data,
-				calculated_size);
+			if (calculated_size > G_MAXSIZE) {
+				/*
+				 * As for g_try_malloc(), so for
+				 * g_try_realloc().
+				 */
+				dest_memory_addr=NULL;
+			} else {
+				dest_memory_addr=g_try_realloc(
+					entry->payload_data,
+					(gsize)calculated_size);
+			}
 			if(!dest_memory_addr) { 
 				/* Memory error */
 				file->is_out_of_memory=TRUE;
-				/* We don have memory for this file. 
+				/* We don't have memory for this file. 
 				   Free the current file content from memory */
 				g_free(entry->payload_data);
 				entry->payload_data=NULL;