set type in CssPropertyList::set()

2 files changed, 9 insertions, 4 deletions

diff --git a/src/css.cc b/src/css.cc
index b9f0cd40..884e7b69 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -32,13 +32,17 @@ CssPropertyList::~CssPropertyList () {
 
 void CssPropertyList::set (CssPropertyName name, CssValueType type,
                            CssPropertyValue value) {
-   for (int i = 0; i < size (); i++)
-      if (getRef (i)->name == name) {
+   for (int i = 0; i < size (); i++) {
+      CssProperty *prop = getRef (i);
+
+      if (prop->name == name) {
          if (ownerOfStrings)
-            getRef (i)->free ();
-         getRef (i)->value = value;
+            prop->free ();
+         prop->type = type;
+         prop->value = value;
          return;
       }
+   }
 
    increase ();
    getRef (size () - 1)->name = name;
diff --git a/src/cssparser.cc b/src/cssparser.cc
index b7923c07..73182d09 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -625,6 +625,7 @@ static bool Css_token_matches_property(CssParser * parser,
       }
    }
 
+   *type = CSS_TYPE_UNUSED;
    return false;
 }