[snip] >> OK. >> Checking the boundaries after _advance_after_end_of_string() is more >> expensive >> than removing the last \0 or reducing the map_end by one. >> >> How could one make the fix upstream? Keeping my own offline patches >> would be a maintenance >> nightmare. > > I'll go with the check after map since it's safer and people extending > Evas would not break it accidentally since they removed or added \0 at > the end of the string. The integer comparison is not hat heavy > anyway.
OK. > > See if this applies and fixes the bug. Sorry for the long back and > forth with this thread :-( Applied, tried and yes, it fixes the bug. It's ok for discussions as long as we get to fix the bug. :-) Thanks. brian > > > Index: src/lib/canvas/evas_object_textblock.c > =================================================================== > --- src/lib/canvas/evas_object_textblock.c (revision 43746) > +++ src/lib/canvas/evas_object_textblock.c (working copy) > @@ -2718,6 +2718,8 @@ > > escape = map_itr; > _advance_after_end_of_string(&map_itr); > + if (map_itr >= map_end) break; > + > mc = map_itr; > sc = s; > match = 1; > > > > -- > Gustavo Sverzut Barbieri > http://profusion.mobi embedded systems > -------------------------------------- > MSN: barbi...@gmail.com > Skype: gsbarbieri > Mobile: +55 (19) 9225-2202 > -- brian ------------------ Cool-Karaoke - The smallest recording studio, in your palm, open-sourced http://cool-idea.com.tw/ iMaGiNaTiOn iS mOrE iMpOrTaNt tHaN kNoWlEdGe ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
