Corrigindo segfault em windows

perry.werneck@gmail.com
1 parent 7162468b
Showing 4 changed files with 22 additions and 6 deletions Show diff stats
src/gtk/dialog.c
src/gtk/main.c
src/gtk/print.c
src/lib3270/selection.c
@@ -387,10 +387,13 @@
  {
  	gchar *text = v3270_get_text(widget);
-	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
+	trace("Action %s activated on widget %p text=%p",gtk_action_get_name(action),widget,text);
 	if(!text)
+	{
+		g_warning("%s","Buffer contents was NULL");
 		return;
+	}
 	save_dialog(	action,
 					widget,
@@ -102,13 +102,14 @@ static int initialize(void)
 			return EINVAL;
 	}
+	return 0;
 }
 int main (int argc, char *argv[])
 {
 	gtk_init(&argc, &argv);
-	if(!initialize())
+	if(initialize())
 		return -1;
 	configuration_init();
@@ -31,6 +31,7 @@
  #include "globals.h"
  #include "v3270/v3270.h"
+ #include <lib3270/selection.h>
 /*--[ Structs ]--------------------------------------------------------------------------------------*/
@@ -317,12 +317,13 @@ static char * get_text(H3270 *hSession,unsigned char all)
 {
 	int	row, col, baddr;
 	char *ret;
-	size_t	  sz = 0;
+	size_t buflen = (hSession->rows * (hSession->cols+1))+1;
+	size_t sz = 0;
 	if(!lib3270_connected(hSession))
 		return NULL;
-	ret = malloc(hSession->rows * (hSession->cols+1));
+	ret = malloc(buflen);
 	baddr = 0;
 	for(row=0;row < hSession->rows;row++)
@@ -342,9 +343,19 @@ static char * get_text(H3270 *hSession,unsigned char all)
 		if(cr)
 			ret[sz++] = '\n';
 	}
-	ret[sz] = 0;
-	return realloc(ret,sz+1);
+	if(!sz)
+	{
+		free(ret);
+		return NULL;
+	}
+
+	ret[sz++] = 0;
+
+	if(sz != buflen)
+		ret = realloc(ret,sz);
+
+	return ret;
 }
 LIB3270_EXPORT char * lib3270_get_text(H3270 *hSession)
	@@ -31,6 +31,7 @@		@@ -31,6 +31,7 @@
31		31
32	#include "globals.h"	32	#include "globals.h"
33	#include "v3270/v3270.h"	33	#include "v3270/v3270.h"
		34	+ #include <lib3270/selection.h>
34		35
35	/--[ Structs ]--------------------------------------------------------------------------------------/	36	/--[ Structs ]--------------------------------------------------------------------------------------/
36		37