Merge pull request #225 from flori/fix-cve-2014-9130

Fix CVE-2014-9130
ruby · Feb 17, 2015 · 40f8e29 · 40f8e29
2 parents 6b689e4 + 7217fc9
commit 40f8e29
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
@@ -1105,13 +1105,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
     int required = (!parser->flow_level
             && parser->indent == (ptrdiff_t)parser->mark.column);
 
-    /*
-     * A simple key is required only when it is the first token in the current
-     * line.  Therefore it is always allowed.  But we add a check anyway.
-     */
-
-    assert(parser->simple_key_allowed || !required);    /* Impossible. */
-
     /*
      * If the current position may start a simple key, save it.
      */