You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
336 lines
14 KiB
336 lines
14 KiB
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/44cbd1e718d6a08e59b9300280c340218a84e089
|
|
|
|
--- a/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
|
|
+++ b/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
|
|
@@ -146,6 +146,8 @@ struct _CRParserPriv {
|
|
|
|
#define CHARS_TAB_SIZE 12
|
|
|
|
+#define RECURSIVE_CALLERS_LIMIT 100
|
|
+
|
|
/**
|
|
* IS_NUM:
|
|
*@a_char: the char to test.
|
|
@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
|
|
|
|
static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
|
|
|
|
-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
|
|
+static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
|
|
+ guint n_calls);
|
|
|
|
-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
|
|
+static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
|
|
+ guint n_calls);
|
|
|
|
static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
|
|
|
|
@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
|
|
cr_parser_try_to_skip_spaces_and_comments (a_this);
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
} while (status == CR_OK);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
|
|
@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status,
|
|
FALSE);
|
|
goto done;
|
|
@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
|
|
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
|
|
} while (status == CR_OK);
|
|
|
|
@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
|
|
*in chapter 4.1 of the css2 spec.
|
|
*block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
|
|
*@param a_this the current instance of #CRParser.
|
|
+ *@param n_calls used to limit recursion depth
|
|
*FIXME: code this function.
|
|
*/
|
|
static enum CRStatus
|
|
-cr_parser_parse_block_core (CRParser * a_this)
|
|
+cr_parser_parse_block_core (CRParser * a_this,
|
|
+ guint n_calls)
|
|
{
|
|
CRToken *token = NULL;
|
|
CRInputPos init_pos;
|
|
@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
|
|
|
|
g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
|
|
|
|
+ if (n_calls > RECURSIVE_CALLERS_LIMIT)
|
|
+ return CR_ERROR;
|
|
+
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
|
|
@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
|
|
} else if (token->type == CBO_TK) {
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, n_calls + 1);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
goto parse_block_content;
|
|
} else {
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
goto parse_block_content;
|
|
}
|
|
@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
ref++;
|
|
goto continue_parsing;
|
|
@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
if (status == CR_OK) {
|
|
ref++;
|
|
goto continue_parsing;
|
|
@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
* | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
|
|
*
|
|
*@param a_this the current instance of #CRParser.
|
|
+ *@param n_calls used to limit recursion depth
|
|
*@return CR_OK upon successfull completion, an error code otherwise.
|
|
*/
|
|
static enum CRStatus
|
|
-cr_parser_parse_any_core (CRParser * a_this)
|
|
+cr_parser_parse_any_core (CRParser * a_this,
|
|
+ guint n_calls)
|
|
{
|
|
CRToken *token1 = NULL,
|
|
*token2 = NULL;
|
|
@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
|
|
g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
|
|
|
|
+ if (n_calls > RECURSIVE_CALLERS_LIMIT)
|
|
+ return CR_ERROR;
|
|
+
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
|
|
@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
*We consider parameter as being an "any*" production.
|
|
*/
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
}
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
}
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
--- a/libtextstyle/lib/libcroco/cr-parser.c
|
|
+++ b/libtextstyle/lib/libcroco/cr-parser.c
|
|
@@ -146,6 +146,8 @@ struct _CRParserPriv {
|
|
|
|
#define CHARS_TAB_SIZE 12
|
|
|
|
+#define RECURSIVE_CALLERS_LIMIT 100
|
|
+
|
|
/**
|
|
* IS_NUM:
|
|
*@a_char: the char to test.
|
|
@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
|
|
|
|
static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
|
|
|
|
-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
|
|
+static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
|
|
+ guint n_calls);
|
|
|
|
-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
|
|
+static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
|
|
+ guint n_calls);
|
|
|
|
static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
|
|
|
|
@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
|
|
cr_parser_try_to_skip_spaces_and_comments (a_this);
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
} while (status == CR_OK);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
|
|
@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status,
|
|
FALSE);
|
|
goto done;
|
|
@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
|
|
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
|
|
} while (status == CR_OK);
|
|
|
|
@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
|
|
*in chapter 4.1 of the css2 spec.
|
|
*block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
|
|
*@param a_this the current instance of #CRParser.
|
|
+ *@param n_calls used to limit recursion depth
|
|
*FIXME: code this function.
|
|
*/
|
|
static enum CRStatus
|
|
-cr_parser_parse_block_core (CRParser * a_this)
|
|
+cr_parser_parse_block_core (CRParser * a_this,
|
|
+ guint n_calls)
|
|
{
|
|
CRToken *token = NULL;
|
|
CRInputPos init_pos;
|
|
@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
|
|
|
|
g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
|
|
|
|
+ if (n_calls > RECURSIVE_CALLERS_LIMIT)
|
|
+ return CR_ERROR;
|
|
+
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
|
|
@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
|
|
} else if (token->type == CBO_TK) {
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, n_calls + 1);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
goto parse_block_content;
|
|
} else {
|
|
cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
goto parse_block_content;
|
|
}
|
|
@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_block_core (a_this);
|
|
+ status = cr_parser_parse_block_core (a_this, 0);
|
|
CHECK_PARSING_STATUS (status, FALSE);
|
|
ref++;
|
|
goto continue_parsing;
|
|
@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
|
|
token);
|
|
token = NULL;
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, 0);
|
|
if (status == CR_OK) {
|
|
ref++;
|
|
goto continue_parsing;
|
|
@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
|
|
* | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
|
|
*
|
|
*@param a_this the current instance of #CRParser.
|
|
+ *@param n_calls used to limit recursion depth
|
|
*@return CR_OK upon successfull completion, an error code otherwise.
|
|
*/
|
|
static enum CRStatus
|
|
-cr_parser_parse_any_core (CRParser * a_this)
|
|
+cr_parser_parse_any_core (CRParser * a_this,
|
|
+ guint n_calls)
|
|
{
|
|
CRToken *token1 = NULL,
|
|
*token2 = NULL;
|
|
@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
|
|
g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
|
|
|
|
+ if (n_calls > RECURSIVE_CALLERS_LIMIT)
|
|
+ return CR_ERROR;
|
|
+
|
|
RECORD_INITIAL_POS (a_this, &init_pos);
|
|
|
|
status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
|
|
@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
*We consider parameter as being an "any*" production.
|
|
*/
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
}
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
|
|
}
|
|
|
|
do {
|
|
- status = cr_parser_parse_any_core (a_this);
|
|
+ status = cr_parser_parse_any_core (a_this, n_calls + 1);
|
|
} while (status == CR_OK);
|
|
|
|
ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
|
|
|