From patchwork Thu May 26 15:59:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: glenvt18 X-Patchwork-Id: 34433 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5xhb-0007Dp-EP; Thu, 26 May 2016 16:00:03 +0000 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5xhZ-0007Dg-CY for vdr@linuxtv.org; Thu, 26 May 2016 16:00:01 +0000 X-tubIT-Incoming-IP: 209.85.217.196 Received: from mail-lb0-f196.google.com ([209.85.217.196]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtps [TLSv1.2:AES128-GCM-SHA256:128] for id 1b5xhX-0001ts-lt; Thu, 26 May 2016 18:00:01 +0200 Received: by mail-lb0-f196.google.com with SMTP id t6so4686972lbv.1 for ; Thu, 26 May 2016 08:59:59 -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; bh=sm8yItdtgg2ZECO01gIsIKxbxsDvq5oKsDDDNxQ8MXo=; b=BJp48xDyRcqqe8eeGGk6hJD48zmHMeiYh0NLH7UgtXlfe0PXdOkkpEDYDEPMrgXArn wKlkVlZ6+eKTczci0cCgaO1QhHw/iIsdIafK+QZdL1MQfbKBCIH869/6dc9DAqJ9X+34 fsVLuB4G9pKjpAYdNj1ZUpEUfEl1qzdX5e8MU/xetnRcJRweIDnPeMDXkvOmF/eJoB/2 jLitczKjsOI28FUuv02Y2UBlkwC+n/Wc3b0/M9hm+FHM4v04FaatB33nG7X/v/KEpVo+ jGLfuA0FWAL/Dp4SNsH0b7JY9sOdgNsJ1Txo3Lx62iQLPm4kBsHgXX0kRJ8V09WSQQs8 i3WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sm8yItdtgg2ZECO01gIsIKxbxsDvq5oKsDDDNxQ8MXo=; b=eMDeNMIQwV1Cmhnnk8Zg5/Cn7QTecFfRefe1pYdurMBtG+J8LpN/B+VVZMlCldfkGv 65W0UFoS/GP4ZojHyWgZ/XqNLVVd05uWQnnbU8xqC5E+TtJ10Ja6A5cd8wsZAz6dSzio pSkK77DHTwpVj2qsPgE0m1FuAzCqNs3PinSjYA7/YrhKgO57R1ibi3eOYK9OQW5GatDs 60ZsENnlxXVCH9lkwBPW2NuaOqGiLJWapXfGpYKQgEqOhUPcUnFsGOnDImDgRVZ76OvA DNjo6QVn7pITV572nU+bS5XmwNLOwtfc5mvTS7jmAoN5PRm30TljwSye42wvTLYcOXoc r9PA== X-Gm-Message-State: ALyK8tIIZ2eSLiYzKw1AKiqZ3vsOIFdS9lmZVLpw0TO5l88WSBBsXmiDb6z18lXURBG3Yw== X-Received: by 10.112.124.228 with SMTP id ml4mr2735617lbb.113.1464278399300; Thu, 26 May 2016 08:59:59 -0700 (PDT) Received: from localhost.localdomain ([185.135.148.114]) by smtp.gmail.com with ESMTPSA id 186sm124442ljf.9.2016.05.26.08.59.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 May 2016 08:59:58 -0700 (PDT) From: glenvt18 To: vdr@linuxtv.org Date: Thu, 26 May 2016 18:59:37 +0300 Message-Id: <1464278377-28705-1-git-send-email-glenvt18@gmail.com> X-Mailer: git-send-email 1.9.1 X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.5.26.155416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FROM_NAME_ONE_WORD 0.05, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, LEGITIMATE_NEGATE 0, MULTIPLE_RCPTS_RND 0, NO_CTA_URI_FOUND 0, NO_URI_FOUND 0, NO_URI_HTTPS 0, WEBMAIL_SOURCE 0, __DATE_TZ_RU 0, __DQ_NEG_HEUR 0, __DQ_NEG_IP 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __RDNS_GMAIL 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __YOUTUBE_RCVD 0' X-LSpam-Score: 0.8 (/) X-LSpam-Report: No, score=0.8 required=5.0 tests=FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RDNS_NONE=1.274, T_DKIM_INVALID=0.01 autolearn=no autolearn_force=no Subject: [vdr] [PATCH] cSkinXXXXDisplayMenu::SetEvent(): fix date buffer size X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: VDR Mailing List MIME-Version: 1.0 Errors-To: vdr-bounces@linuxtv.org Sender: "vdr" 32 bytes is not enough for multi-byte utf8 strings Date string is truncated. Please review, Sergey Chernyavskiy. --- PLUGINS/src/skincurses/skincurses.c | 2 +- skinclassic.c | 2 +- skinlcars.c | 2 +- skinsttng.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 358035e..fcf183d 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -407,7 +407,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event) return; int y = 2; cTextScroller ts; - char t[32]; + char t[64]; snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString()); ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground); if (Event->Vps() && Event->Vps() != Event->StartTime()) { diff --git a/skinclassic.c b/skinclassic.c index b6d183b..410230d 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -352,7 +352,7 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event) const cFont *font = cFont::GetFont(fontOsd); int y = y2; cTextScroller ts; - char t[32]; + char t[64]; snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString()); ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); if (Event->Vps() && Event->Vps() != Event->StartTime()) { diff --git a/skinlcars.c b/skinlcars.c index d84a753..7c5561c 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -1636,7 +1636,7 @@ void cSkinLCARSDisplayMenu::SetEvent(const cEvent *Event) int xl = xi00; int y = yi00; cTextScroller ts; - char t[32]; + char t[64]; snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString()); ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground)); if (Event->Vps() && Event->Vps() != Event->StartTime()) { diff --git a/skinsttng.c b/skinsttng.c index f10f120..f81b13e 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -655,7 +655,7 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event) int xl = x3 + TextSpacing; int y = y3; cTextScroller ts; - char t[32]; + char t[64]; snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString()); ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); if (Event->Vps() && Event->Vps() != Event->StartTime()) {