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>
This commit is contained in:
parent
521cb40b0c
commit
b09734b1f4
1 changed files with 3 additions and 1 deletions
|
@ -78,8 +78,10 @@ int ceph_unarmor(char *dst, const char *src, const char *end)
|
||||||
while (src < end) {
|
while (src < end) {
|
||||||
int a, b, c, d;
|
int a, b, c, d;
|
||||||
|
|
||||||
if (src < end && src[0] == '\n')
|
if (src[0] == '\n') {
|
||||||
src++;
|
src++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (src + 4 > end)
|
if (src + 4 > end)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
a = decode_bits(src[0]);
|
a = decode_bits(src[0]);
|
||||||
|
|
Loading…
Reference in a new issue