[{"id":12985,"web_url":"https://patchwork.libcamera.org/comment/12985/","msgid":"<c85f44f9-d3fe-ff08-2e93-1ea7abc0021f@ideasonboard.com>","date":"2020-10-05T15:39:53","subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Umang,\n\nOn 05/10/2020 14:11, Umang Jain wrote:\n> Use the newly introduced utils::toAscii() utility to remove all\n> non-ASCII characters for EXIF_FORMAT_ASCII strings.\n> \n> Signed-off-by: Umang Jain <email@uajain.com>\n> ---\n>  src/android/jpeg/exif.cpp | 13 +++++++++----\n>  1 file changed, 9 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> index 3fd5d55..bd528a7 100644\n> --- a/src/android/jpeg/exif.cpp\n> +++ b/src/android/jpeg/exif.cpp\n> @@ -8,6 +8,7 @@\n>  #include \"exif.h\"\n>  \n>  #include \"libcamera/internal/log.h\"\n> +#include \"libcamera/internal/utils.h\"\n>  \n>  using namespace libcamera;\n>  \n> @@ -171,15 +172,19 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n>  \n>  void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n>  {\n> -\t/* Pad 1 extra byte for null-terminated string in ASCII format. */\n> -\tsize_t length = format == EXIF_FORMAT_ASCII ?\n> -\t\t\titem.length() + 1 : item.length();\n> +\tsize_t length = item.length();\n> +\tstd::string str = item;\n> +\tif (format == EXIF_FORMAT_ASCII) {\n> +\t\tstr = utils::toAscii(str);\n> +\t\t/* Pad 1 extra byte to null-terminate the ASCII string. */\n> +\t\tlength += 1;\n\nThis could of course also be\n\t\tlength++;\n\nBut += 1 is also quite readable here so I don't mind it staying.\n\nSanitizing the Ascii strings seems to make some sense, especially as we\ndo it elsewhere - so here seems reasonable to me.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n> +\t}\n>  \n>  \tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n>  \tif (!entry)\n>  \t\treturn;\n>  \n> -\tmemcpy(entry->data, item.c_str(), length);\n> +\tmemcpy(entry->data, str.c_str(), length);\n>  \texif_entry_unref(entry);\n>  }\n>  \n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9D7A8C3B5D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  5 Oct 2020 15:39:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2760263C28;\n\tMon,  5 Oct 2020 17:39:58 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F60A63BE4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  5 Oct 2020 17:39:56 +0200 (CEST)","from [192.168.0.217]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DF2343B;\n\tMon,  5 Oct 2020 17:39:55 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PVXQbaql\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601912396;\n\tbh=DxeyjXY3zEXWOb2NSJ3pCL80NcjedRxN5eGzmKP1XII=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=PVXQbaql0htV9kAQuzKDHGZJFy+t3bRLsBn2UaDpE3G+OKVzRmTkHtDOPQTAlKriI\n\tZG9YDYnr4SK1Iqt+b6rvE47JR8Gj4RKfMbTIYszBnmChwe4IyAGWFdTlN8QpWTCEaF\n\th4hfGtCfm5rVZRNkvHW37CeiKhe4BcqSZGck2ac8=","To":"Umang Jain <email@uajain.com>, libcamera-devel@lists.libcamera.org","References":"<20201005131137.50124-1-email@uajain.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<c85f44f9-d3fe-ff08-2e93-1ea7abc0021f@ideasonboard.com>","Date":"Mon, 5 Oct 2020 16:39:53 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201005131137.50124-1-email@uajain.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":12987,"web_url":"https://patchwork.libcamera.org/comment/12987/","msgid":"<20201005155323.GS3931@pendragon.ideasonboard.com>","date":"2020-10-05T15:53:23","subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Mon, Oct 05, 2020 at 04:39:53PM +0100, Kieran Bingham wrote:\n> Hi Umang,\n> \n> On 05/10/2020 14:11, Umang Jain wrote:\n> > Use the newly introduced utils::toAscii() utility to remove all\n> > non-ASCII characters for EXIF_FORMAT_ASCII strings.\n> > \n> > Signed-off-by: Umang Jain <email@uajain.com>\n> > ---\n> >  src/android/jpeg/exif.cpp | 13 +++++++++----\n> >  1 file changed, 9 insertions(+), 4 deletions(-)\n> > \n> > diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> > index 3fd5d55..bd528a7 100644\n> > --- a/src/android/jpeg/exif.cpp\n> > +++ b/src/android/jpeg/exif.cpp\n> > @@ -8,6 +8,7 @@\n> >  #include \"exif.h\"\n> >  \n> >  #include \"libcamera/internal/log.h\"\n> > +#include \"libcamera/internal/utils.h\"\n> >  \n> >  using namespace libcamera;\n> >  \n> > @@ -171,15 +172,19 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n> >  \n> >  void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n> >  {\n> > -\t/* Pad 1 extra byte for null-terminated string in ASCII format. */\n> > -\tsize_t length = format == EXIF_FORMAT_ASCII ?\n> > -\t\t\titem.length() + 1 : item.length();\n> > +\tsize_t length = item.length();\n> > +\tstd::string str = item;\n> > +\tif (format == EXIF_FORMAT_ASCII) {\n> > +\t\tstr = utils::toAscii(str);\n> > +\t\t/* Pad 1 extra byte to null-terminate the ASCII string. */\n> > +\t\tlength += 1;\n\nlength may have changed after the call to toAscii()\n\n> \n> This could of course also be\n> \t\tlength++;\n> \n> But += 1 is also quite readable here so I don't mind it staying.\n> \n> Sanitizing the Ascii strings seems to make some sense, especially as we\n> do it elsewhere - so here seems reasonable to me.\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> \n> > +\t}\n> >  \n> >  \tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n> >  \tif (!entry)\n> >  \t\treturn;\n> >  \n> > -\tmemcpy(entry->data, item.c_str(), length);\n> > +\tmemcpy(entry->data, str.c_str(), length);\n> >  \texif_entry_unref(entry);\n> >  }\n> >","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9BD41C3B5D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  5 Oct 2020 15:54:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B56D63BE4;\n\tMon,  5 Oct 2020 17:54:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7AC4263B19\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  5 Oct 2020 17:54:03 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 901373B;\n\tMon,  5 Oct 2020 17:54:02 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ZiKgkA11\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601913242;\n\tbh=Xs9S39oLGsJzzawpL2hJEAW0JnqqVBkTBmuwQXK1LU4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ZiKgkA11o0K8/AcOSCzxdzxpvbR2Uohw3tRtT4TdItUbMNuiLgzA3PA8uw4pO0QKw\n\tNmaZdW+zst6zgnGJrYsboLoXwWoBTNdvOuDSCf4p8IdAO6KQIAJEI+1zZoPqDN5FHi\n\ti/Getfl0mJTVuIhURJqxu40Ns9sJdCOO8U5WzF4o=","Date":"Mon, 5 Oct 2020 18:53:23 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20201005155323.GS3931@pendragon.ideasonboard.com>","References":"<20201005131137.50124-1-email@uajain.com>\n\t<c85f44f9-d3fe-ff08-2e93-1ea7abc0021f@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<c85f44f9-d3fe-ff08-2e93-1ea7abc0021f@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":12993,"web_url":"https://patchwork.libcamera.org/comment/12993/","msgid":"<6f962fe6-abcc-8abf-5da4-1ba90c8e227f@uajain.com>","date":"2020-10-05T17:03:51","subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/","name":"Umang Jain","email":"email@uajain.com"},"content":"Hi Laurent,\n\nOn 10/5/20 9:23 PM, Laurent Pinchart wrote:\n> On Mon, Oct 05, 2020 at 04:39:53PM +0100, Kieran Bingham wrote:\n>> Hi Umang,\n>>\n>> On 05/10/2020 14:11, Umang Jain wrote:\n>>> Use the newly introduced utils::toAscii() utility to remove all\n>>> non-ASCII characters for EXIF_FORMAT_ASCII strings.\n>>>\n>>> Signed-off-by: Umang Jain <email@uajain.com>\n>>> ---\n>>>   src/android/jpeg/exif.cpp | 13 +++++++++----\n>>>   1 file changed, 9 insertions(+), 4 deletions(-)\n>>>\n>>> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n>>> index 3fd5d55..bd528a7 100644\n>>> --- a/src/android/jpeg/exif.cpp\n>>> +++ b/src/android/jpeg/exif.cpp\n>>> @@ -8,6 +8,7 @@\n>>>   #include \"exif.h\"\n>>>   \n>>>   #include \"libcamera/internal/log.h\"\n>>> +#include \"libcamera/internal/utils.h\"\n>>>   \n>>>   using namespace libcamera;\n>>>   \n>>> @@ -171,15 +172,19 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n>>>   \n>>>   void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n>>>   {\n>>> -\t/* Pad 1 extra byte for null-terminated string in ASCII format. */\n>>> -\tsize_t length = format == EXIF_FORMAT_ASCII ?\n>>> -\t\t\titem.length() + 1 : item.length();\n>>> +\tsize_t length = item.length();\n>>> +\tstd::string str = item;\n>>> +\tif (format == EXIF_FORMAT_ASCII) {\n>>> +\t\tstr = utils::toAscii(str);\n>>> +\t\t/* Pad 1 extra byte to null-terminate the ASCII string. */\n>>> +\t\tlength += 1;\n> length may have changed after the call to toAscii()\nOops, great catch. Submitted v2.\n>\n>> This could of course also be\n>> \t\tlength++;\n>>\n>> But += 1 is also quite readable here so I don't mind it staying.\n>>\n>> Sanitizing the Ascii strings seems to make some sense, especially as we\n>> do it elsewhere - so here seems reasonable to me.\n>>\n>> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>>\n>>\n>>> +\t}\n>>>   \n>>>   \tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n>>>   \tif (!entry)\n>>>   \t\treturn;\n>>>   \n>>> -\tmemcpy(entry->data, item.c_str(), length);\n>>> +\tmemcpy(entry->data, str.c_str(), length);\n>>>   \texif_entry_unref(entry);\n>>>   }\n>>>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 62D86C3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  5 Oct 2020 17:03:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DCBCD63C52;\n\tMon,  5 Oct 2020 19:03:55 +0200 (CEST)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DCDF063BED\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  5 Oct 2020 19:03:54 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"dq4QJUKJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1601917434; bh=LiWAjKUM/KRDvynLx8lZIbG5nM+TZvOQCRE7e0lFsw0=;\n\th=Subject:To:Cc:References:From:In-Reply-To;\n\tb=dq4QJUKJwuXnhN6e8FWK+DS8+XxdpmVS0/zwfNOnjBK0fH2pDoIy40rCuSn0sW5BK\n\tt1DEm/FagGzm11ZJmMvju/91DIw+2yg5XVD5okhKFc7cC5AiJDagpAhaKUDQxqyChO\n\tDQg+fr6wRwt1gwNUBUCO2n4xtZ90Stesc/9SVFSnN/JcPXKToAbLNNC96+muxbIWiK\n\tJtLCtHrtGAdwmraA0LitveTh3gjEF4Hktxxu2FEh3Q2JKirPusKFybbagQq5KRatht\n\tqgu30n8Tk17z60ePo36vg/5GXaiBcelAO3ZIC3g7BFW9XsGzLSHh3F9mYa9GGGeloX\n\tSCVIeksN+mgYw==","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>","References":"<20201005131137.50124-1-email@uajain.com>\n\t<c85f44f9-d3fe-ff08-2e93-1ea7abc0021f@ideasonboard.com>\n\t<20201005155323.GS3931@pendragon.ideasonboard.com>","From":"Umang Jain <email@uajain.com>","Message-ID":"<6f962fe6-abcc-8abf-5da4-1ba90c8e227f@uajain.com>","Date":"Mon, 5 Oct 2020 22:33:51 +0530","Mime-Version":"1.0","In-Reply-To":"<20201005155323.GS3931@pendragon.ideasonboard.com>","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH] android: jpeg: exif: Sanitize ASCII\n\tstrings with utils::toAscii()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Transfer-Encoding":"7bit","Content-Type":"text/plain; charset=\"us-ascii\"; Format=\"flowed\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]