Corrigindo segfault na impressão quando a tabela de cores está errada

perry.werneck@gmail.com
1 parent 12e3bf67
Showing 2 changed files with 19 additions and 7 deletions Show diff stats
src/pw3270/print.c
src/pw3270/v3270/widget.c
@@ -395,6 +395,9 @@ static gchar * enum_to_string(GType type, guint enum_value)
  {
 	gchar *ptr = get_string_from_config("print","colors","");
+	trace("info->color=%p",info->color);
+	trace("colorlist=%p",ptr);
+
 	if(*ptr)
 		v3270_set_color_table(info->color,ptr);
 	else
@@ -1296,15 +1296,24 @@ void v3270_set_color_table(GdkRGBA *table, const gchar *colors)
 		g_warning("Color table has %d elements; should be %d.",cnt,V3270_COLOR_COUNT);
-		for(f=0;f < cnt;f++)
-			gdk_rgba_parse(table+f,clr[f]);
-
-		for(f=cnt; f < V3270_COLOR_COUNT;f++)
-			gdk_rgba_parse(table+f,clr[cnt-1]);
+		if(cnt < V3270_COLOR_COUNT)
+		{
+			// Less than the required
+			for(f=0;f < cnt;f++)
+				gdk_rgba_parse(table+f,clr[f]);
-		clr[V3270_COLOR_OIA_BACKGROUND] = clr[0];
-		clr[V3270_COLOR_SELECTED_BG] 	= clr[0];
+			for(f=cnt; f < V3270_COLOR_COUNT;f++)
+				gdk_rgba_parse(table+f,clr[cnt-1]);
+			clr[V3270_COLOR_OIA_BACKGROUND] = clr[0];
+			clr[V3270_COLOR_SELECTED_BG] 	= clr[0];
+		}
+		else
+		{
+			// More than required
+			for(f=0;f < V3270_COLOR_COUNT;f++)
+				gdk_rgba_parse(table+f,clr[f]);
+		}
  	}
 	g_strfreev(clr);