uhd/uhd-3.9.4-base64-decode-fix...

24 lines
1.1 KiB
Diff

From 99524f1dbf784e1c49d9e274f0efe56cb3a9e26a Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <github@kayari.org>
Date: Wed, 25 May 2016 12:49:36 +0100
Subject: [PATCH] Fix off-by-one error
There's an off-by-one error in base64_decode_value that results in undefined behaviour when it's passed `'\x7b'`
---
host/lib/usrp/x300/cdecode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/host/lib/usrp/x300/cdecode.c b/host/lib/usrp/x300/cdecode.c
index 1d09cbe..424de6c 100644
--- a/host/lib/usrp/x300/cdecode.c
+++ b/host/lib/usrp/x300/cdecode.c
@@ -11,7 +11,7 @@ int base64_decode_value(char value_in){
static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
static const char decoding_size = sizeof(decoding);
value_in -= 43;
- if ((signed char)value_in < 0 || value_in > decoding_size) return -1;
+ if ((signed char)value_in < 0 || value_in >= decoding_size) return -1;
return decoding[(int)value_in];
}