From bfa17f414a00a0aa76f079070157fc647c5256ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sun, 30 Aug 2015 09:51:31 -0400 Subject: [PATCH] lib/re: make `native` a local variable to check it is not null MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/core/re.nit | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/core/re.nit b/lib/core/re.nit index 99421f8..ecf9469 100644 --- a/lib/core/re.nit +++ b/lib/core/re.nit @@ -272,6 +272,9 @@ class Regex private fun get_error(errcode: Int): String do + var native = native + assert native != null + # Error, should be out of memory but we cover any possible error anyway var error_cstr = native.regerror(errcode) @@ -291,6 +294,9 @@ class Regex var comp_res = compile assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + var native = native + assert native != null + # Actually execute var eflags = gather_eflags var res = native.regexec_match_only(text.to_cstring, eflags) @@ -320,6 +326,9 @@ class Regex var comp_res = compile assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + var native = native + assert native != null + # Actually execute text = text.to_s var cstr = text.substring_from(from).to_cstring @@ -353,6 +362,9 @@ class Regex var comp_res = compile assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + var native = native + assert native != null + # Actually execute text = text.to_s var sub = text.substring_from(from) @@ -404,6 +416,9 @@ class Regex var comp_res = compile assert comp_res == null else "Regex compilation failed with: {comp_res.message}\n".output + var native = native + assert native != null + # Actually execute text = text.to_s var cstr = text.to_cstring -- 1.7.9.5