Merge pull request RustPython#2346 from isidentical/issue-2345

coolreader18 · web-flow · commit 0cbdb8a20839 · 2020-11-30T10:34:17.000-06:00
Fix crash on lexing octal escapes bigger than u8::MAX
diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
@@ -457,7 +457,8 @@ where
                 break;
             }
         }
-        u8::from_str_radix(&octet_content, 8).unwrap() as char
+        let value = u32::from_str_radix(&octet_content, 8).unwrap();
+        char::from_u32(value).unwrap()
     }
 
     fn parse_unicode_name(&mut self) -> Result<char, LexicalError> {
@@ -1596,7 +1597,7 @@ mod tests {
 
     #[test]
     fn test_string() {
-        let source = r#""double" 'single' 'can\'t' "\\\"" '\t\r\n' '\g' r'raw\'' '\200\0a'"#;
+        let source = r#""double" 'single' 'can\'t' "\\\"" '\t\r\n' '\g' r'raw\'' '\420' '\200\0a'"#;
         let tokens = lex_source(source);
         assert_eq!(
             tokens,
@@ -1629,6 +1630,10 @@ mod tests {
                     value: String::from("raw\\'"),
                     is_fstring: false,
                 },
+                Tok::String {
+                    value: String::from("Đ"),
+                    is_fstring: false,
+                },
                 Tok::String {
                     value: String::from("\u{80}\u{0}a"),
                     is_fstring: false,
