[[ CID 15622 ]] Fix dereference after null check issue.

livecodeian · livecodeian · commit 174626880958 · 2016-04-18T11:48:22.000+01:00
diff --git a/engine/src/ibmp.cpp b/engine/src/ibmp.cpp
@@ -2412,7 +2412,7 @@ static bool xpm_read_v1_header(IO_handle p_stream, char x_line[XPM_MAX_LINE], ui
 
 			t_success = t_name != nil && t_width != 0 && t_height != 0;
 
-			if (MCCStringFirstIndexOf(x_line, t_name, t_colors_index))
+			if (t_success && MCCStringFirstIndexOf(x_line, t_name, t_colors_index))
 			{
 				t_colors_index += MCCStringLength(t_name);
 				// may be a monochrome table, in which case we keep looking
@@ -2424,7 +2424,8 @@ static bool xpm_read_v1_header(IO_handle p_stream, char x_line[XPM_MAX_LINE], ui
 			}
 		}
 
-		t_success = IO_NORMAL == IO_fgets(x_line, XPM_MAX_LINE, p_stream);
+		if (t_success)
+			t_success = IO_NORMAL == IO_fgets(x_line, XPM_MAX_LINE, p_stream);
 	}
 
 	if (t_success)

Original file line number	Diff line number	Diff line change
`@@ -2412,7 +2412,7 @@ static bool xpm_read_v1_header(IO_handle p_stream, char x_line[XPM_MAX_LINE], ui`
`2412`	`2412`
`2413`	`2413`	`t_success = t_name != nil && t_width != 0 && t_height != 0;`
`2414`	`2414`
`2415`		`- if (MCCStringFirstIndexOf(x_line, t_name, t_colors_index))`
	`2415`	`+ if (t_success && MCCStringFirstIndexOf(x_line, t_name, t_colors_index))`
`2416`	`2416`	`{`
`2417`	`2417`	`t_colors_index += MCCStringLength(t_name);`
`2418`	`2418`	`// may be a monochrome table, in which case we keep looking`
`@@ -2424,7 +2424,8 @@ static bool xpm_read_v1_header(IO_handle p_stream, char x_line[XPM_MAX_LINE], ui`
`2424`	`2424`	`}`
`2425`	`2425`	`}`
`2426`	`2426`
`2427`		`- t_success = IO_NORMAL == IO_fgets(x_line, XPM_MAX_LINE, p_stream);`
	`2427`	`+ if (t_success)`
	`2428`	`+ t_success = IO_NORMAL == IO_fgets(x_line, XPM_MAX_LINE, p_stream);`
`2428`	`2429`	`}`
`2429`	`2430`
`2430`	`2431`	`if (t_success)`