libb64: Fix integer overflow and uninitialized C++ objects.
PATCH 1/1 libb64: Fix integer overflow and uninitialized C++ objects.
Fixes a runtime bug on compilers where unsigned char is the default. Fixes a runtime bug where _state variable in the encoder and decoder c++ objects where not initialized by the constructors.
--- package/libb64/0001-Integer-overflows.patch | 68 +++++++++++++++++++ .../libb64/0002-Initialize-C++-objects.patch | 35 ++++++++++ 2 files changed, 103 insertions(+) create mode 100644 package/libb64/0001-Integer-overflows.patch create mode 100644 package/libb64/0002-Initialize-C++-objects.patch
package/libb64/0001-Integer-overflows.patch new file +68 -0
@@ -0,0 +1,68 @@ +Fix integer overflows. Will not work on compilers with unsigned char as the default. +Fetch from: https://sources.debian.org/patches/libb64/1.2-5/ +Combined "integer overflows.diff" and "off by one.diff" and adapted for version 1.2.1. + +Signed-off-by: Mikael Eliasson <[email protected]> +diff --git a/src/cdecode.c b/src/cdecode.c +index a6c0a42..45da4e1 100644 +--- a/src/cdecode.c ++++ b/src/cdecode.c +@@ -9,10 +9,11 @@ For details, see http://sourceforge.net/projects/libb64 + + 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 signed 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); ++ if (value_in < 43) return -1; + value_in -= 43; +- if (value_in < 0 || value_in >= decoding_size) return -1; ++ if (value_in >= decoding_size) return -1; + return decoding[(int)value_in]; + } + +@@ -26,7 +27,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + { + const char* codechar = code_in; + char* plainchar = plaintext_out; +- char fragment; ++ int fragment; + + *plainchar = state_in->plainchar; + +@@ -42,7 +43,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar = (fragment & 0x03f) << 2; + case step_b: +@@ -53,7 +54,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x030) >> 4; + *plainchar = (fragment & 0x00f) << 4; +@@ -65,7 +66,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x03c) >> 2; + *plainchar = (fragment & 0x003) << 6; +@@ -77,7 +78,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex + state_in->plainchar = *plainchar; + return plainchar - plaintext_out; + } +- fragment = (char)base64_decode_value(*codechar++); ++ fragment = base64_decode_value(*codechar++); + } while (fragment < 0); + *plainchar++ |= (fragment & 0x03f); + }
package/libb64/0002-Initialize-C++-objects.patch new file +35 -0
@@ -0,0 +1,35 @@ +Fixes uninitialized C++ encoder and decoder _state variable bug. +Fetch from: https://sources.debian.org/patches/libb64/1.2-5/ +initialize-coder-state.diff patch without modifications. + +Signed-off-by: Mikael Eliasson <[email protected]> +diff --git a/include/b64/decode.h b/include/b64/decode.h +index 12b16ea..d3f7d60 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -24,7 +24,9 @@ namespace base64 + + decoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) +- {} ++ { ++ base64_init_decodestate(&_state); ++ } + + int decode(char value_in) + { +diff --git a/include/b64/encode.h b/include/b64/encode.h +index 5d807d9..49aafdc 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -24,7 +24,9 @@ namespace base64 + + encoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) +- {} ++ { ++ base64_init_encodestate(&_state); ++ } + + int encode(char value_in) + {
Signature · 1 line
2.17.1
Thomas Petazzoni
AppliedPATCH 1/1 libb64: Fix integer overflow and uninitialized C++ objects.
Quoted 11 lines · On Thu, 23 Aug 2018 16:04:46 +0200 Mikael Eliasson <[email protected]> wrote:
Fixes a runtime bug on compilers where unsigned char is the default. Fixes a runtime bug where
_statevariable in the encoder and decoder c++ objects where not initialized by the constructors.Signed-off-by Mikael Eliasson <[email protected]>--- package/libb64/0001-Integer-overflows.patch | 68 +++++++++++++++++++ .../libb64/0002-Initialize-C++-objects.patch | 35 ++++++++++ 2 files changed, 103 insertions(+) create mode 100644 package/libb64/0001-Integer-overflows.patch create mode 100644 package/libb64/0002-Initialize-C++-objects.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 libb64: Fix integer overflow and uninitialized C++ objects.
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Quoted 4 lines · On Thu, 23 Aug 2018 16:04:46 +0200 Mikael Eliasson <[email protected]> wrote:
Fixes a runtime bug on compilers where unsigned char is the default. Fixes a runtime bug where
_statevariable in the encoder and decoder c++ objects where not initialized by the constructors.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Mikael Eliasson <[email protected]>---
package/libb64/0001-Integer-overflows.patch| 68 +++++++++++++++++++.../libb64/0002-Initialize-C++-objects.patch| 35 ++++++++++2 files changed, 103 insertions(+)create mode 100644
package/libb64/0001-Integer-overflows.patchcreate mode 100644package/libb64/0002-Initialize-C++-objects.patch
Committed to 2018.02.x and 2018.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard