make icon resist bad values for icon property.

googlearchive · Apr 9, 2014 · 84868c8 · 84868c8
1 parent 15a3580
commit 84868c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core-icon.html b/core-icon.html
@@ -153,13 +153,13 @@
       },
 
       updateIcon: function() {
-        if (!this.icon) {
+        if (!(this.icon && typeof this.icon === 'string')) {
           return;
         }
         var parts = this.icon.split(':');
         var icon = parts.pop();
         var set = this.getIconset(parts.pop());
-        if (set) {
+        if (set && icon) {
           var scale = this.size / set.iconSize;
           set.applyIcon(this, icon, this.activeTheme, scale);
         }