[MPlayer-cvslog] r19669 - trunk/libass/ass_render.c

[eugeni]

Author: eugeni
Date: Mon Sep  4 19:52:28 2006
New Revision: 19669

Modified:
   trunk/libass/ass_render.c

Log:
Fix possible unallocated memory read in libass line wrapping code.


Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Mon Sep  4 19:52:28 2006
@@ -1349,9 +1349,9 @@
 
 					w = s2;
 					do { --w; } while ((w > s1) && (w->symbol == ' '));
-					do { --w; } while ((w > s1) && (w->symbol != ' '));
+					while ((w > s1) && (w->symbol != ' ')) { --w; }
 					e1 = w;
-					do { --e1; } while ((e1 > s1) && (e1->symbol == ' '));
+					while ((e1 > s1) && (e1->symbol == ' ')) { --e1; }
 					if (w->symbol == ' ') ++w;
 
 					l1 = ((s2-1)->bbox.xMax + (s2-1)->pos.x) - (s1->bbox.xMin + s1->pos.x);