X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ferror.c;h=46972f5cb660601923d82f58e6580ac89117bcdf;hb=refs%2Fheads%2Fmaster;hp=c130e71a268f61011e9beb5718c707f1c8326c60;hpb=d2e0af1718294569a84c3c15616c74e4d55ea579;p=m6w6%2Fext-psi

diff --git a/src/error.c b/src/error.c
index c130e71..46972f5 100644
--- a/src/error.c
+++ b/src/error.c
@@ -75,15 +75,17 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
 
 	va_start(argv, msg);
 	psi_verror(type, fn, ln, msg, argv);
-#ifdef __clang__
 	va_end(argv);
+
 	va_start(argv, msg);
-#endif
-	PSI_DEBUG_PRINTV(context, msg, argv);
+	PSI_DEBUG_LOCK(context,
+			PSI_DEBUG_PRINTV(context, msg, argv);
+			PSI_DEBUG_PRINT(context, "\n");
+	);
 	va_end(argv);
 
 	if (context) {
-		strlcpy(context->last_error, PG(last_error_message),
+		strlcpy(context->last_error, PG(last_error_message)->val,
 				sizeof(context->last_error));
 	}
 }
@@ -99,5 +101,7 @@ void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 
 void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
 {
-	zend_error_cb(type, fn, ln, msg, argv);
+	zend_string *message = zend_vstrpprintf(0, msg, argv);
+	zend_error_cb(type, fn, ln, message);
+	zend_string_release(message);
 }