user32: More instances where early versions of usp10 are not well behaved with…

user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL. Issue discovered by Qian Hong.

user32: More instances where early versions of usp10 are not well behaved with…
bd7e8df6 · Aric Stewart · Alexandre Julliard · 423d50eb · bd7e8df6
Commit bd7e8df6 authored Nov 27, 2012 by Aric Stewart Committed by Alexandre Julliard Nov 28, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

edit.c dlls/user32/edit.c +10 -3

No files found.
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -640,7 +640,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
 				current_line->net_length = prev;
 				EDIT_InvalidateUniscribeData_linedef(current_line);
 				EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
-				sz = ScriptString_pSize(current_line->ssa);
+				if (current_line->ssa)
+					sz = ScriptString_pSize(current_line->ssa);
+				else sz = 0;
 				if (sz)
 					current_line->width = sz->cx;
 				else
@@ -697,8 +699,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
 			if (current_line->net_length > 0)
 			{
 				EDIT_UpdateUniscribeData_linedef(es, NULL, current_line);
-				sz = ScriptString_pSize(current_line->ssa);
+				if (current_line->ssa)
-				current_line->width = sz->cx;
+				{
+					sz = ScriptString_pSize(current_line->ssa);
+					current_line->width = sz->cx;
+				}
+				else
+					current_line->width = 0;
 			}
 			else current_line->width = 0;
 		    }