fix for potention crash when conversion fails

[wxWidgets.git] / src / html / htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 9bae31f64028faf1c19751989c2f236bc560df79..6686cb9cba08f95b2fd03173ab609d701da19fe2 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -15,12 +15,13 @@
 
 #if wxUSE_HTML
 
 
 #if wxUSE_HTML
 

+#include "wx/html/htmltag.h"
+

 #ifndef WXPRECOMP
 #ifndef WXPRECOMP

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/html/htmltag.h"

 #include "wx/html/htmlpars.h"
 #include "wx/html/htmlpars.h"

-#include "wx/colour.h"

 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 
 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 


@@ -410,20 +411,13 @@ int wxHtmlTag::ScanParam(const wxString& par,
 
 bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
 {
 
 bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
 {

+    wxASSERT(clr);

     wxString str = GetParam(par);
 
     wxString str = GetParam(par);
 

-    if (str.empty()) return false;
-    if (str.GetChar(0) == wxT('#'))
-    {
-        unsigned long tmp;
-        if (ScanParam(par, wxT("#%lX"), &tmp) != 1)
-            return false;
-        *clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16),
-                        (unsigned char)((tmp & 0x00FF00) >> 8),
-                        (unsigned char)(tmp & 0x0000FF));
+    if (clr->Set(str))

         return true;
         return true;

-    }
-    else
+
+    if (!str.empty())

     {
         // Handle colours defined in HTML 4.0:
         #define HTML_COLOUR(name,r,g,b)                 \
     {
         // Handle colours defined in HTML 4.0:
         #define HTML_COLOUR(name,r,g,b)                 \