[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-67-gec72960

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ec729608fd05bf88a5b1457a50077035c9485dd3 (commit)
      from  17d5a9b3f3776dfe10e3c88b41f458adff81e6fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ec729608fd05bf88a5b1457a50077035c9485dd3


commit ec729608fd05bf88a5b1457a50077035c9485dd3
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Feb 17 00:37:26 2011 +0100

    Don't pass an empty font name on to the Font constructor. (Bug #32508.)

diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index c4cea0d..c51d482 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -1456,10 +1456,14 @@ TextField::handleChar(std::wstring::const_iterator& it,
                             }
                             attloc = attributes.find("FACE");
                             if (attloc != attributes.end()) {
-                                //font FACE attribute
-                                Font* newfont = new Font(attloc->second,
-                                    rec.getFont()->isBold(), 
rec.getFont()->isItalic());
-                                newrec.setFont(newfont);
+                                if (attloc->second.empty()) {
+                                    log_error("Expected a font name in FACE 
attribute.");
+                                } else {
+                                    //font FACE attribute
+                                    Font* newfont = new Font(attloc->second,
+                                        rec.getFont()->isBold(), 
rec.getFont()->isItalic());
+                                    newrec.setFont(newfont);
+                                }
                             }
                             attloc = attributes.find("SIZE");
                             if (attloc != attributes.end()) {

-----------------------------------------------------------------------

Summary of changes:
 libcore/TextField.cpp |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash