mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-29 15:29:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow hex CSS colour values with omitted hash. Fix #rgb and #rrggbb handling to only accept hex characters.

Browse Source 
svn path=/trunk/netsurf/; revision=3620
This commit is contained in:
Michael Drake 2007-10-03 06:47:45 +00:00
parent 3c8c4e7378
commit 686c98fafd
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
css/ruleset.c
View File

@ -31,6 +31,7 @@
#define _GNU_SOURCE /* for strndup */ #define _GNU_SOURCE /* for strndup */
#include <assert.h> #include <assert.h>
#include <ctype.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -685,13 +686,22 @@ colour parse_colour(const struct css_node * const v)
unsigned int r, g, b; unsigned int r, g, b;
struct css_colour_entry *col; struct css_colour_entry *col;
char colour_name[21]; char colour_name[21];
bool valid_hex = true;
switch (v->type) { switch (v->type) {
case CSS_NODE_HASH: case CSS_NODE_HASH:
if (v->data_length == 4) {
for (unsigned int i = 1; i < v->data_length; i++) {
if (!isxdigit(v->data[i])) {
valid_hex = false;
break;
}
}
if (v->data_length == 4 && valid_hex == true) {
if (sscanf(v->data + 1, "%1x%1x%1x", &r, &g, &b) == 3) if (sscanf(v->data + 1, "%1x%1x%1x", &r, &g, &b) == 3)
c = (b << 20) | (b << 16) | (g << 12) | (g << 8) | (r << 4) | r; c = (b << 20) | (b << 16) | (g << 12) | (g << 8) | (r << 4) | r;
} else if (v->data_length == 7) { } else if (v->data_length == 7 && valid_hex == true) {
if (sscanf(v->data + 1, "%2x%2x%2x", &r, &g, &b) == 3) if (sscanf(v->data + 1, "%2x%2x%2x", &r, &g, &b) == 3)
c = (b << 16) | (g << 8) | r; c = (b << 16) | (g << 8) | r;
} }
@ -722,6 +732,28 @@ colour parse_colour(const struct css_node * const v)
break; break;
} }
/* Hex colour vaules without a preceding # are invalid but it is a
* common omission that other browsers cater for. */
if (c == CSS_COLOR_NONE && (v->type == CSS_NODE_DELIM ||
v->type == CSS_NODE_IDENT || v->type == CSS_NODE_NUMBER ||
v->type == CSS_NODE_DIMENSION)) {
for (unsigned int i = 0; i < v->data_length; i++) {
if (!isxdigit(v->data[i])) {
valid_hex = false;
break;
}
}
if (v->data_length == 3 && valid_hex == true) {
if (sscanf(v->data, "%1x%1x%1x", &r, &g, &b) == 3)
c = (b << 20) | (b << 16) | (g << 12) | (g << 8) | (r << 4) | r;
} else if (v->data_length == 6 && valid_hex == true) {
if (sscanf(v->data, "%2x%2x%2x", &r, &g, &b) == 3)
c = (b << 16) | (g << 8) | r;
}
LOG(("Invalid CSS colour: %.*s", v->data_length, v->data));
}
return c; return c;
} }