Mercurial > hg > openjdk > jigsaw > nashorn
changeset 191:a3fc89d33072
8011980: Allow NUL character in character class
Reviewed-by: sundar, lagergren
| author | hannesw |
|---|---|
| date | Thu, 11 Apr 2013 12:16:39 +0200 |
| parents | 256bb030ce0a |
| children | ed4293ceec0e |
| files | src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java test/script/basic/JDK-8011980.js test/script/basic/JDK-8011980.js.EXPECTED |
| diffstat | 3 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Thu Apr 11 15:04:55 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Thu Apr 11 12:16:39 2013 +0200 @@ -874,7 +874,6 @@ switch (ch0) { case ']': case '-': - case '\0': return false; case '[':
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8011980.js Thu Apr 11 12:16:39 2013 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8011980: Allow NUL character in character class + * + * @test + * @run + */ + +print(RegExp("\0").test("\0")); +print(RegExp("[\0]").test("\0")); +print(RegExp("[\x00]").test("\0")); +print(RegExp("[\u0000]").test("\0"));