[{"id":13054,"web_url":"https://patchwork.libcamera.org/comment/13054/","msgid":"<20201007125229.vxkm5rcnvu6bc64s@oden.dyn.berto.se>","date":"2020-10-07T12:52:29","subject":"Re: [libcamera-devel] [PATCH v3] android: jpeg: exif: Sanitize\n\tASCII strings with utils::toAscii()","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Umang,\n\nThanks for your work.\n\nOn 2020-10-06 11:14:59 +0530, 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 \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/jpeg/exif.cpp | 25 +++++++++++++++++++++----\n> 1 file changed, 21 insertions(+), 4 deletions(-)\n> \n> ---\n> Changes in v3:\n> - Carry out small optimizing suggested by Laurent.\n> \n> Changes in v2:\n> - Set new length for sanitized string.\n> ---\n> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> index 3fd5d55..e4a116d 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,31 @@ 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> +\tstd::string ascii;\n> +\tsize_t length;\n> +\tconst char *str;\n> +\n> +\tif (format == EXIF_FORMAT_ASCII) {\n> +\t\tascii = utils::toAscii(item);\n> +\t\tstr = ascii.c_str();\n> +\n> +\t\t/* Pad 1 extra byte to null-terminate the ASCII string. */\n> +\t\tlength = ascii.length() + 1;\n> +\t} else {\n> +\t\tstr = item.c_str();\n> +\n> +\t\t/*\n> +\t\t * Strings stored in different formats (EXIF_FORMAT_UNDEFINED)\n> +\t\t * are not null-terminated.\n> +\t\t */\n> +\t\tlength = item.length();\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, length);\n> \texif_entry_unref(entry);\n> }\n> \n> -- \n> 2.26.2\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","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 F192FBEEDF\n\tfor ;\n\tWed, 7 Oct 2020 12:52:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0E31605B1;\n\tWed, 7 Oct 2020 14:52:31 +0200 (CEST)","from mail-lf1-x143.google.com (mail-lf1-x143.google.com\n\t[IPv6:2a00:1450:4864:20::143])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C9B3F6055E\n\tfor ;\n\tWed, 7 Oct 2020 14:52:30 +0200 (CEST)","by mail-lf1-x143.google.com with SMTP id y11so2146840lfl.5\n\tfor ;\n\tWed, 07 Oct 2020 05:52:30 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tk13sm337079ljh.136.2020.10.07.05.52.29\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 07 Oct 2020 05:52:29 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"QSJlTx/q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=fi6+3g/1+u70mFpIpYMC734mU2KaceczzkA8Ev4Rsww=;\n\tb=QSJlTx/qJcE4VMz97IjVlAZAGOx0W4YNgwX38q/TcsjSqEjCpOP5xgw1JrD23wVfcT\n\tEFWpbjRpp+11FHCja4ardhSKJHZgrUtCXTzbzc/GdmuH7r1Nn32hjF003L1RV5Qe4d1N\n\txtZq5d8YDiri6vgBbvsAYZpbpomHcSn6jNIvHlGKIY3FwBfzYVLfWv4n0lC0PgDtXUMm\n\t1bq404i7SsWVl3/jQjJ92BMoRtfQTlzwcIQLKnX6fUssI/t4gByxVk9xg9ol6byvtJAv\n\twArNc57GZuUy1DMm52Jx0ybH6Aj9yDOaRsaLd10bJwZIxxdI0STaTOvk8xyubnh+E4Au\n\ti4/A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=fi6+3g/1+u70mFpIpYMC734mU2KaceczzkA8Ev4Rsww=;\n\tb=szJpyt27Ovqrn/g4HdqE5365tnCCFi1YJBS5Qu4X0Np4PzzA6NfY0w7HmQdguf36/0\n\tYqeIIZ6d7AgqDYkrft0VAt3ZmMgHD5uCESzcSQAbAyuHt50Ajl3vyOGsPEo1dHZMXUXs\n\tKw2tTloqpvy3ERW5/exq55zuuaZtrECTZrr50drT60rZZrz2U0WBL/3LQqzNzXLKX09+\n\txNmb+kSUXHWuWiIQikOgAwCrcqKfZfZWnx/nKLo4Jb4B35lMQTnJUikWGSG2pzkacWmy\n\tu/jvlbgENfxn1fpl6GLoqX4bYLnFzda9m2wURWMPTiDieuuJZaWZ/dEYw9zr9AjkLFnl\n\tT+uQ==","X-Gm-Message-State":"AOAM531Ze8DyxBLPhOQRoeLZueihdoEu54SXbVrh6m8QykpSEBtV4Tzf\n\t1huUdBJ/eKXNvtjPiR6dAJ1ipqec14gBrA==","X-Google-Smtp-Source":"ABdhPJyTlhWqbHSU1su4QPYBnWw/2ztdr8dwom/ncnpnzml4c/RF+wBPdapyjnJqHox70WmoDA9GEA==","X-Received":"by 2002:a19:2358:: with SMTP id j85mr291266lfj.29.1602075150160; \n\tWed, 07 Oct 2020 05:52:30 -0700 (PDT)","Date":"Wed, 7 Oct 2020 14:52:29 +0200","From":"Niklas =?utf-8?q?S=C3=B6derlund?= ","To":"Umang Jain ","Message-ID":"<20201007125229.vxkm5rcnvu6bc64s@oden.dyn.berto.se>","References":"<20201006054459.19742-1-email@uajain.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201006054459.19742-1-email@uajain.com>","Subject":"Re: [libcamera-devel] [PATCH v3] android: jpeg: exif: Sanitize\n\tASCII strings with utils::toAscii()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]