Download as
Browse Code »

Commit 3504b0162e4d43ec56937c809c4107bb36fba171

Authored by perry.werneck@gmail.com
1 parent 7162468b
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo segfault em windows

Showing 4 changed files with 22 additions and 6 deletions   Show diff stats
src/gtk/dialog.c
  Diff comments   View file @3504b01
... ... @@ -387,10 +387,13 @@
387 387 {
388 388 gchar *text = v3270_get_text(widget);
389 389  
390   - trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
  390 + trace("Action %s activated on widget %p text=%p",gtk_action_get_name(action),widget,text);
391 391  
392 392 if(!text)
  393 + {
  394 + g_warning("%s","Buffer contents was NULL");
393 395 return;
  396 + }
394 397  
395 398 save_dialog( action,
396 399 widget,
... ...
src/gtk/main.c
  Diff comments   View file @3504b01
... ... @@ -102,13 +102,14 @@ static int initialize(void)
102 102 return EINVAL;
103 103 }
104 104  
  105 + return 0;
105 106 }
106 107  
107 108 int main (int argc, char *argv[])
108 109 {
109 110 gtk_init(&argc, &argv);
110 111  
111   - if(!initialize())
  112 + if(initialize())
112 113 return -1;
113 114  
114 115 configuration_init();
... ...
src/gtk/print.c
  Diff comments   View file @3504b01
... ... @@ -31,6 +31,7 @@
31 31  
32 32 #include "globals.h"
33 33 #include "v3270/v3270.h"
  34 + #include <lib3270/selection.h>
34 35  
35 36 /*--[ Structs ]--------------------------------------------------------------------------------------*/
36 37  
... ...
src/lib3270/selection.c
  Diff comments   View file @3504b01
... ... @@ -317,12 +317,13 @@ static char * get_text(H3270 *hSession,unsigned char all)
317 317 {
318 318 int row, col, baddr;
319 319 char *ret;
320   - size_t sz = 0;
  320 + size_t buflen = (hSession->rows * (hSession->cols+1))+1;
  321 + size_t sz = 0;
321 322  
322 323 if(!lib3270_connected(hSession))
323 324 return NULL;
324 325  
325   - ret = malloc(hSession->rows * (hSession->cols+1));
  326 + ret = malloc(buflen);
326 327  
327 328 baddr = 0;
328 329 for(row=0;row < hSession->rows;row++)
... ... @@ -342,9 +343,19 @@ static char * get_text(H3270 *hSession,unsigned char all)
342 343 if(cr)
343 344 ret[sz++] = '\n';
344 345 }
345   - ret[sz] = 0;
346 346  
347   - return realloc(ret,sz+1);
  347 + if(!sz)
  348 + {
  349 + free(ret);
  350 + return NULL;
  351 + }
  352 +
  353 + ret[sz++] = 0;
  354 +
  355 + if(sz != buflen)
  356 + ret = realloc(ret,sz);
  357 +
  358 + return ret;
348 359 }
349 360  
350 361 LIB3270_EXPORT char * lib3270_get_text(H3270 *hSession)
... ...