From: Loic Dachary <loic@dachary.org>
To: ceph-devel@vger.kernel.org
Subject: [PATCH] fix operator>=(bufferlist& l, bufferlist& r)
Date: Sat, 16 Feb 2013 10:11:15 +0100 [thread overview]
Message-ID: <1361005875-768-1-git-send-email-loic@dachary.org> (raw)
bufferlist a;
a.append("A");
bufferlist ab;
ab.append("AB");
a >= ab failed, throwing an instance of 'ceph::buffer::end_of_buffer'
because it tried to access a[1]. All comparison operators should be
tested using a lexicographic sort like strcmp or memcmp (-1, 0, 1).
In the meantime, the missing test is added:
if (l.length() == p && r.length() > p) return false;
A set of unit tests demonstrating the problem and covering all comparison
operators are added to show that the proposed fix works as expected.
http://tracker.ceph.com/issues/4157 refs #4157
Signed-off-by: Loic Dachary <loic@dachary.org>
---
src/include/buffer.h | 1 +
src/test/bufferlist.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/src/include/buffer.h b/src/include/buffer.h
index 4f87ed7..b84e7f4 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -467,6 +467,7 @@ inline bool operator>=(bufferlist& l, bufferlist& r) {
for (unsigned p = 0; ; p++) {
if (l.length() > p && r.length() == p) return true;
if (r.length() == p && l.length() == p) return true;
+ if (l.length() == p && r.length() > p) return false;
if (l[p] > r[p]) return true;
if (l[p] < r[p]) return false;
}
diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index 91e37e6..71c2e79 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -57,6 +57,53 @@ TEST(BufferList, zero) {
}
}
+TEST(BufferList, compare) {
+ bufferlist a;
+ a.append("A");
+ bufferlist ab;
+ ab.append("AB");
+ bufferlist ac;
+ ac.append("AC");
+ //
+ // bool operator>(bufferlist& l, bufferlist& r)
+ //
+ ASSERT_FALSE(a > ab);
+ ASSERT_TRUE(ab > a);
+ ASSERT_TRUE(ac > ab);
+ ASSERT_FALSE(ab > ac);
+ ASSERT_FALSE(ab > ab);
+ //
+ // bool operator>=(bufferlist& l, bufferlist& r)
+ //
+ ASSERT_FALSE(a >= ab);
+ ASSERT_TRUE(ab >= a);
+ ASSERT_TRUE(ac >= ab);
+ ASSERT_FALSE(ab >= ac);
+ ASSERT_TRUE(ab >= ab);
+ //
+ // bool operator<(bufferlist& l, bufferlist& r)
+ //
+ ASSERT_TRUE(a < ab);
+ ASSERT_FALSE(ab < a);
+ ASSERT_FALSE(ac < ab);
+ ASSERT_TRUE(ab < ac);
+ ASSERT_FALSE(ab < ab);
+ //
+ // bool operator<=(bufferlist& l, bufferlist& r)
+ //
+ ASSERT_TRUE(a <= ab);
+ ASSERT_FALSE(ab <= a);
+ ASSERT_FALSE(ac <= ab);
+ ASSERT_TRUE(ab <= ac);
+ ASSERT_TRUE(ab <= ab);
+ //
+ // bool operator==(bufferlist &l, bufferlist &r)
+ //
+ ASSERT_FALSE(a == ab);
+ ASSERT_FALSE(ac == ab);
+ ASSERT_TRUE(ab == ab);
+}
+
TEST(BufferList, EmptyAppend) {
bufferlist bl;
bufferptr ptr;
--
1.7.10.4
next reply other threads:[~2013-02-16 9:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-16 9:11 Loic Dachary [this message]
2013-02-16 22:52 ` [PATCH] fix operator>=(bufferlist& l, bufferlist& r) Sage Weil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361005875-768-1-git-send-email-loic@dachary.org \
--to=loic@dachary.org \
--cc=ceph-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.