From: Jani Nikula Date: Sun, 10 Apr 2016 19:43:22 +0000 (+0300) Subject: [PATCH 2/3] lib: fix handling of one character long directory names at top level X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50fb75975b2b245b51d26be1428883ba3b2e2d8c;p=notmuch-archives.git [PATCH 2/3] lib: fix handling of one character long directory names at top level --- diff --git a/2e/0238e609a9bb8defa8ddd587214fdd823ed9b4 b/2e/0238e609a9bb8defa8ddd587214fdd823ed9b4 new file mode 100644 index 000000000..b9e798a25 --- /dev/null +++ b/2e/0238e609a9bb8defa8ddd587214fdd823ed9b4 @@ -0,0 +1,150 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 79A806DE0008 + for ; Sun, 10 Apr 2016 12:44:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.558 +X-Spam-Level: +X-Spam-Status: No, score=-0.558 tagged_above=-999 required=5 tests=[AWL=0.162, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nfu7wjkc7SG1 for ; + Sun, 10 Apr 2016 12:44:40 -0700 (PDT) +Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com + [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 427156DE028C for + ; Sun, 10 Apr 2016 12:44:40 -0700 (PDT) +Received: by mail-wm0-f66.google.com with SMTP id n3so16822443wmn.1 + for ; Sun, 10 Apr 2016 12:44:40 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=nikula-org.20150623.gappssmtp.com; s=20150623; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=JyHaoTek1t3VbWiG4zUshy1t8BT/SLk37xZ1+bmvAqs=; + b=m7pApQwS3msxZIQGqIAUDfUJ/5jNHKGscj71SZke6stmbvvQtD1GfBFrHaZ/frYyv0 + xbYsef75gDTEd7IqeoNidHR8I7ghxCZDyZ0sSnRDR/rk3utaybJ7UtZKcifJa/cGldFg + MMt9osFZ534keakij//bbQZ/G0RJuTXYKYHPsoX2+KhEUJwXLTiZvSBrVRlN2inhGt+e + Kg54o+EEXJkCMInmU7iOdc0W69DY4uxXMl3XFQK1X5z6aM9uvNu944Ru7Nh1GkkHUghy + moUGdwAg3ibLrXwzU1xW3Fq5e46pktwtouqM13aN+qL6pN/PF4IzwYqb907CRjLFzRDU + 8A2w== +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:in-reply-to + :references; + bh=JyHaoTek1t3VbWiG4zUshy1t8BT/SLk37xZ1+bmvAqs=; + b=lh0LzcHVho/8kjJSxPimgilGQgRLf8LDZZu1oYE0xPEguiDPwI7fCHYM816ukkdFjU + CDW7yiPwY0gefaierS/J7utSAccBlyZWR/pfvFIJOqXznYOzaUfPyEq3seclrgV7BSm2 + Zqf11BzEPOA7vhW6nTAG64uNGjSuw1aYx7AB/Ldu8dr8gHx7plG5G2X2G+e9Vx8yStlY + iMbnmv0SJ0snaloq6B8fssx/BUj4HeI5ehnZWLvPwiVugQpL/T6k16gOL8FFVgTKMQik + CqTgvLK6K3Kol4KTu5GZcFakS9mrGJsIn8DZQIc5EjJLuY+jmsn3u2G0bnTJcTch2PbL + Pjbw== +X-Gm-Message-State: + AD7BkJK8MZp0W8W6QEBoxQTqAHFGxcPEiijqiK9tUmBQZc7k+WDkIQ8U7XqvGHzrCgqCzg== +X-Received: by 10.28.176.133 with SMTP id z127mr14940871wme.66.1460317479006; + Sun, 10 Apr 2016 12:44:39 -0700 (PDT) +Received: from localhost (mobile-access-bcee7f-102.dhcp.inet.fi. + [188.238.127.102]) + by smtp.gmail.com with ESMTPSA id m134sm13720530wmd.14.2016.04.10.12.44.38 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 10 Apr 2016 12:44:38 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] lib: fix handling of one character long directory names + at top level +Date: Sun, 10 Apr 2016 22:43:22 +0300 +Message-Id: <1460317403-13714-2-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1460317403-13714-1-git-send-email-jani@nikula.org> +References: <1460317403-13714-1-git-send-email-jani@nikula.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 10 Apr 2016 19:44:48 -0000 + +The code to skip multiple slashes in _notmuch_database_split_path() +skips back one character too much. This is compensated by a +1 in the +length parameter to the strndup() call. Mostly this works fine, but if +the path is to a file under a top level directory with one character +long name, the directory part is mistaken to be part of the file name +(slash == path in code). The returned directory name will be the empty +string and the basename will be the full path, breaking the indexing +logic in notmuch new. + +Fix the multiple slash skipping to keep the slash variable pointing at +the last slash, and adjust strndup() accordingly. + +The bug was introduced in + +commit e890b0cf4011fd9fd77ebd87343379e4a778888b +Author: Carl Worth +Date: Sat Dec 19 13:20:26 2009 -0800 + + database: Store the parent ID for each directory document. + +just a little over two months after the initial commit in the Notmuch +code history, making this the longest living bug in Notmuch to date. +--- + lib/database.cc | 4 ++-- + test/T050-new.sh | 5 ----- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index 3b342f136a53..b8486f7d5271 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -1781,7 +1781,7 @@ _notmuch_database_split_path (void *ctx, + + /* Finally, skip multiple slashes. */ + while (slash != path) { +- if (*slash != '/') ++ if (*(slash - 1) != '/') + break; + + --slash; +@@ -1794,7 +1794,7 @@ _notmuch_database_split_path (void *ctx, + *basename = path; + } else { + if (directory) +- *directory = talloc_strndup (ctx, path, slash - path + 1); ++ *directory = talloc_strndup (ctx, path, slash - path); + } + + return NOTMUCH_STATUS_SUCCESS; +diff --git a/test/T050-new.sh b/test/T050-new.sh +index 174715aa2781..53e02d22c383 100755 +--- a/test/T050-new.sh ++++ b/test/T050-new.sh +@@ -170,7 +170,6 @@ test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory $ + No new mail. Removed 3 messages." + + test_begin_subtest "One character directory at top level" +-test_subtest_known_broken + + generate_message [dir]=A + generate_message [dir]=A/B +@@ -179,10 +178,6 @@ generate_message [dir]=A/B/C + output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 3 new messages to the database." + +-# clean up after the broken test to not mess up other tests +-rm -rf "${MAIL_DIR}"/A +-NOTMUCH_NEW 2>&1 > /dev/null +- + test_begin_subtest "Support single-message mbox" + cat > "${MAIL_DIR}"/mbox_file1 <