diff --git a/[refs] b/[refs]
index 7a391bb178d0..78fc2a7c6602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b45f21c2e42f265f6fd469e43857e98e2fdf01c
+refs/heads/master: 9612ef6716efc20fac0f57d59452cda4e6846bda
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 4595aeb3c432..f4190b5764de 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -4833,8 +4833,8 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,
 		msg = strerror_r(errnum, buf, buflen);
 		if (msg != buf) {
 			size_t len = strlen(msg);
-			char *c = mempcpy(buf, msg, min(buflen-1, len));
-			*c = '\0';
+			memcpy(buf, msg, min(buflen - 1, len));
+			*(buf + min(buflen - 1, len)) = '\0';
 		}
 		return 0;
 	}