Bugfixing previous bugfix in rpn_jit

python_rpnexpr.h

@@ -112,7 +112,7 @@ PyObject* rpnexpr_getstate(PyObject *cls, PyObject *noargs);
  * @param state Should by a bytes Python instance returned by @ref
  * rpnexpr_getstate
  * @return A bytes Python instance suitable as argument for
- * @ref rpnexpr_setstate
+ * @ref rpnexpr_getstate
  */
 PyObject* rpnexpr_setstate(PyObject *cls, PyObject *state);
 

rpn_jit.c

@@ -152,7 +152,6 @@ int rpn_expr_untokenize(rpn_expr_t *expr, rpn_tokenized_t *tokens, char long_op)
 			goto ret_err;
 		}
 	}
-	expr->toks.tokens_sz = tokens->tokens_sz;
 
 	if(_rpn_expr_end_map(expr))
 	{
@@ -163,6 +162,20 @@ int rpn_expr_untokenize(rpn_expr_t *expr, rpn_tokenized_t *tokens, char long_op)
 		return -1;
 	}
 
+	expr->toks.tokens = malloc(sizeof(rpn_token_t)*tokens->tokens_sz);
+	if(!expr->toks.tokens)
+	{
+		snprintf(expr->err_reason, 128,
+			"Unable to allocate memory for tokens : %s",
+			strerror(errno));
+		expr->state = RPN_ERROR;
+		return -1;
+	}
+	memcpy(expr->toks.tokens, tokens->tokens,
+	       sizeof(rpn_token_t)*tokens->tokens_sz);
+	expr->toks.tokens_sz = tokens->tokens_sz;
+	expr->toks.argc = tokens->argc;
+
 	expr->state = RPN_READY;
 	return 0;
 

rpn_parse.c

@@ -253,7 +253,7 @@ char* rpn_tokenized_expr(rpn_tokenized_t *tokens, char long_op)
 				err=errno;
 				dprintf(2,"Error allocating memory for expression : %s",
 					strerror(err));
-				goto ret_err;
+				goto free_err;
 			}
 			cur = tmp + (cur - expr);
 			expr = tmp;