Commit b09734b1 authored Feb 02, 2011 by Tommi Virtanen Committed by Sage Weil Mar 15, 2011

libceph: Fix base64-decoding when input ends in newline.



It used to return -EINVAL because it thought the end was not aligned
to 4 bytes.

Clean up superfluous src < end test in if, the while itself guarantees
that.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Signed-off-by: Sage Weil <sage@newdream.net>

parent 521cb40b

net/ceph/armor.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -78,8 +78,10 @@ int ceph_unarmor(char dst, const char src, const char *end)
		while (src < end) {
		int a, b, c, d;

		if (src < end && src[0] == '\n')
		if (src[0] == '\n') {
		src++;
		continue;
		}
		if (src + 4 > end)
		return -EINVAL;
		a = decode_bits(src[0]);

Admin message