From patchwork Sun Sep 23 10:00:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 186196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C7492C0092 for ; Sun, 23 Sep 2012 20:20:08 +1000 (EST) Received: from localhost ([::1]:46706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFj05-0005cL-2h for incoming@patchwork.ozlabs.org; Sun, 23 Sep 2012 06:01:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFizW-0004Oh-OG for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFizV-0007f4-LD for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:46 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:51494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFizV-0007cW-8T for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:45 -0400 Received: by mail-wi0-f175.google.com with SMTP id c10so120249wiw.10 for ; Sun, 23 Sep 2012 03:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=CcRkbPwqGKGnqIT6IigHGMUTitiRtJypJOUG2FP1zhM=; b=C0iFhfwljc4Bkr2+ukvhgDqm0ut+rXP9rGdU3UBpVV++938/6bqgOZD4ouG3pRvd7B qw8cCJMXHWNnHnkL/l+O4NSxL6UxJgH1xP5VaiLGytVj3nEsaCQOS2969OyTHiqUth8D jYuy+Xoik40O/LzTpc8Vu1xQH1C98YKalfygtVfHfOoyM7QKV+fXfLmlcipwnnL0HFJc VD0D9OjMCoOZc9ox4P5IkGCWAiOoVODBigxtq3n1vJHOfAyY0fcp/lW0Gn9kqEYqqXJp ZqsLWjtFrIafh65Bi40v65O/7KYZMfJaoy0pPgO4wKrfAmO+5iczIC/owN8OXaPUkVjQ kuNw== Received: by 10.216.181.195 with SMTP id l45mr5531904wem.52.1348394444709; Sun, 23 Sep 2012 03:00:44 -0700 (PDT) Received: from localhost ([109.224.133.37]) by mx.google.com with ESMTPS id q4sm8299416wix.9.2012.09.23.03.00.43 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Sep 2012 03:00:44 -0700 (PDT) From: Stefan Hajnoczi To: Anthony Liguori Date: Sun, 23 Sep 2012 11:00:16 +0100 Message-Id: <1348394420-28298-11-git-send-email-stefanha@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348394420-28298-1-git-send-email-stefanha@gmail.com> References: <1348394420-28298-1-git-send-email-stefanha@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.175 Cc: Stefan Hajnoczi , Laszlo Ersek , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 10/14] TextConsole: saturate escape parameter in TTY_STATE_CSI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Laszlo Ersek Signed-off-by: Laszlo Ersek Reviewed-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- console.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/console.c b/console.c index a8bcc42..3f3d254 100644 --- a/console.c +++ b/console.c @@ -938,8 +938,11 @@ static void console_putchar(TextConsole *s, int ch) case TTY_STATE_CSI: /* handle escape sequence parameters */ if (ch >= '0' && ch <= '9') { if (s->nb_esc_params < MAX_ESC_PARAMS) { - s->esc_params[s->nb_esc_params] = - s->esc_params[s->nb_esc_params] * 10 + ch - '0'; + int *param = &s->esc_params[s->nb_esc_params]; + int digit = (ch - '0'); + + *param = (*param <= (INT_MAX - digit) / 10) ? + *param * 10 + digit : INT_MAX; } } else { if (s->nb_esc_params < MAX_ESC_PARAMS)