Change function signature of grok_bslash_o

The previous return value where NULL meant OK is outside-the-norm.

1 files changed, 20 insertions, 15 deletions

diff --git a/regcomp.c b/regcomp.c
index 1cc2e10064..43b881db19 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -7360,7 +7360,6 @@ tryagain:
 	    register UV ender;
 	    register char *p;
 	    char *s;
-	    char *error_msg;
 	    STRLEN foldlen;
 	    U8 tmpbuf[UTF8_MAXBYTES_CASE+1], *foldbuf;
 
@@ -7465,19 +7464,23 @@ tryagain:
 			{
 			    STRLEN brace_len = len;
 			    UV result;
-			    if ((error_msg = grok_bslash_o(p,
-							   &result,
-							   &brace_len,
-							   SIZE_ONLY))
-				!= NULL)
-			    {
+			    const char* error_msg;
+
+			    bool valid = grok_bslash_o(p,
+						       &result,
+						       &brace_len,
+						       &error_msg,
+						       1);
+			    p += brace_len;
+			    if (! valid) {
+				RExC_parse = p;	/* going to die anyway; point
+						   to exact spot of failure */
 				vFAIL(error_msg);
 			    }
 			    else
 			    {
 				ender = result;
 			    }
-			    p += brace_len;
 			    if (PL_encoding && ender < 0x100) {
 				goto recode_encoding;
 			    }
@@ -7995,7 +7998,6 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, U32 depth)
 
 parseit:
     while (RExC_parse < RExC_end && UCHARAT(RExC_parse) != ']') {
-	char* error_msg;
 
     charclassloop:
 
@@ -8104,15 +8106,18 @@ parseit:
 	    case 'a':	value = ASCII_TO_NATIVE('\007');break;
 	    case 'o':
 		RExC_parse--;	/* function expects to be pointed at the 'o' */
-		if ((error_msg = grok_bslash_o(RExC_parse,
+		{
+		    const char* error_msg;
+		    bool valid = grok_bslash_o(RExC_parse,
 					       &value,
 					       &numlen,
-					       SIZE_ONLY))
-		    != NULL)
-		{
-		    vFAIL(error_msg);
+					       &error_msg,
+					       SIZE_ONLY);
+		    RExC_parse += numlen;
+		    if (! valid) {
+			vFAIL(error_msg);
+		    }
 		}
-		RExC_parse += numlen;
 		if (PL_encoding && value < 0x100) {
 		    goto recode_encoding;
 		}