From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0qVi-000152-JS for qemu-devel@nongnu.org; Mon, 23 Nov 2015 07:46:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0qVg-0007Gq-Jh for qemu-devel@nongnu.org; Mon, 23 Nov 2015 07:46:22 -0500 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:33550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0qVg-0007Gm-Dp for qemu-devel@nongnu.org; Mon, 23 Nov 2015 07:46:20 -0500 Received: by wmec201 with SMTP id c201so158739979wme.0 for ; Mon, 23 Nov 2015 04:46:20 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Mon, 23 Nov 2015 13:45:41 +0100 Message-Id: <1448282741-22897-2-git-send-email-rth@twiddle.net> In-Reply-To: <1448282741-22897-1-git-send-email-rth@twiddle.net> References: <1448282741-22897-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL for-2.5] tcg: Fix highwater check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, John Clarke From: John Clarke A simple typo in the variable to use when comparing vs the highwater mark. Reports are that qemu can in fact segfault occasionally due to this mistake. Signed-off-by: John Clarke Signed-off-by: Richard Henderson --- tcg/tcg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 682af8a..b20ed19 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2443,7 +2443,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf) one operation beginning below the high water mark cannot overrun the buffer completely. Thus we can test for overflow after generating code without having to check during generation. */ - if (unlikely(s->code_gen_ptr > s->code_gen_highwater)) { + if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) { return -1; } } -- 2.4.3