}
bool
-Perl_grok_bslash_o(pTHX_ char **s, UV *uv, const char** error_msg,
+Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
+ const char** error_msg,
const bool output_warning, const bool strict,
const bool silence_non_portable,
const bool UTF)
* It guarantees that the returned codepoint, *uv, when expressed as
* utf8 bytes, would fit within the skipped "\o{...}" bytes.
* On input:
- * s is the address of a pointer to a NULL terminated string that begins
- * with 'o', and the previous character was a backslash. At exit, *s
- * will be advanced to the byte just after those absorbed by this
- * function. Hence the caller can continue parsing from there. In
- * the case of an error, this routine has generally positioned *s to
- * point just to the right of the first bad spot, so that a message
- * that has a "<--" to mark the spot will be correctly positioned.
+ * s is the address of a pointer to a string. **s is 'o', and the
+ * previous character was a backslash. At exit, *s will be advanced
+ * to the byte just after those absorbed by this function. Hence the
+ * caller can continue parsing from there. In the case of an error,
+ * this routine has generally positioned *s to point just to the right
+ * of the first bad spot, so that a message that has a "<--" to mark
+ * the spot will be correctly positioned.
+ * send - 1 gives a limit in *s that this function is not permitted to
+ * look beyond. That is, the function may look at bytes only in the
+ * range *s..send-1
* uv points to a UV that will hold the output value, valid only if the
* return from the function is TRUE
* error_msg is a pointer that will be set to an internal buffer giving an
* ourselves */
| PERL_SCAN_SILENT_ILLDIGIT;
-#ifdef DEBUGGING
- char *start = *s - 1;
- assert(*start == '\\');
-#endif
-
PERL_ARGS_ASSERT_GROK_BSLASH_O;
-
- assert(**s == 'o');
+ assert(*(*s - 1) == '\\');
+ assert(* *s == 'o');
(*s)++;
- if (**s != '{') {
+ if (send <= *s || **s != '{') {
*error_msg = "Missing braces on \\o{}";
return FALSE;
}
- e = strchr(*s, '}');
+ e = (char *) memchr(*s, '}', send - *s);
if (!e) {
(*s)++; /* Move past the '{' */
while (isOCTAL(**s)) { /* Position beyond the legal digits */
numbers_len = e - *s;
if (numbers_len == 0) {
(*s)++; /* Move past the } */
- *error_msg = "Number with no digits";
+ *error_msg = "Empty \\o{}";
return FALSE;
}
if (numbers_len != (STRLEN) (e - *s)) {
if (strict) {
*s += numbers_len;
- *s += (UTF) ? UTF8SKIP(*s) : (STRLEN) 1;
+ *s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
*error_msg = "Non-octal character";
return FALSE;
}
}
bool
-Perl_grok_bslash_x(pTHX_ char **s, UV *uv, const char** error_msg,
+Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
+ const char** error_msg,
const bool output_warning, const bool strict,
const bool silence_non_portable,
const bool UTF)
* utf8 bytes, would fit within the skipped "\x{...}" bytes.
*
* On input:
- * s is the address of a pointer to a NULL terminated string that begins
- * with 'x', and the previous character was a backslash. At exit, *s
- * will be advanced to the byte just after those absorbed by this
- * function. Hence the caller can continue parsing from there. In
- * the case of an error, this routine has generally positioned *s to
- * point just to the right of the first bad spot, so that a message
- * that has a "<--" to mark the spot will be correctly positioned.
+ * s is the address of a pointer to a string. **s is 'x', and the
+ * previous character was a backslash. At exit, *s will be advanced
+ * to the byte just after those absorbed by this function. Hence the
+ * caller can continue parsing from there. In the case of an error,
+ * this routine has generally positioned *s to point just to the right
+ * of the first bad spot, so that a message that has a "<--" to mark
+ * the spot will be correctly positioned.
+ * send - 1 gives a limit in *s that this function is not permitted to
+ * look beyond. That is, the function may look at bytes only in the
+ * range *s..send-1
* uv points to a UV that will hold the output value, valid only if the
* return from the function is TRUE
* error_msg is a pointer that will be set to an internal buffer giving an
char* e;
STRLEN numbers_len;
I32 flags = PERL_SCAN_DISALLOW_PREFIX;
-#ifdef DEBUGGING
- char *start = *s - 1;
- assert(*start == '\\');
-#endif
+
PERL_ARGS_ASSERT_GROK_BSLASH_X;
- assert(**s == 'x');
+ assert(*(*s - 1) == '\\');
+ assert(* *s == 'x');
+
(*s)++;
+ if (send <= *s) {
+ if (strict) {
+ *error_msg = "Empty \\x";
+ return FALSE;
+ }
+
+ /* Sadly, to preserve backcompat, an empty \x at the end of string is
+ * interpreted as a NUL */
+ *uv = 0;
+ return TRUE;
+ }
+
if (strict || ! output_warning) {
flags |= PERL_SCAN_SILENT_ILLDIGIT;
}
*s += len;
if (strict && len != 2) {
if (len < 2) {
- *s += (UTF) ? UTF8SKIP(*s) : 1;
+ *s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
*error_msg = "Non-hex character";
}
else {
return TRUE;
}
- e = strchr(*s, '}');
+ e = (char *) memchr(*s, '}', send - *s);
if (!e) {
(*s)++; /* Move past the '{' */
while (isXDIGIT(**s)) { /* Position beyond the legal digits */
if (numbers_len == 0) {
if (strict) {
(*s)++; /* Move past the } */
- *error_msg = "Number with no digits";
+ *error_msg = "Empty \\x{}";
return FALSE;
}
*s = e + 1;
if (strict && numbers_len != (STRLEN) (e - *s)) {
*s += numbers_len;
- *s += (UTF) ? UTF8SKIP(*s) : 1;
+ *s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
*error_msg = "Non-hex character";
return FALSE;
}