From af98b8ea0fd256e0860695615b0b2992523591fc Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sun, 28 Jun 2020 11:25:10 +0200 Subject: Fix rare 1 byte buffer over-read --- plugins/gpgme-vala/src/gpgme_helper.vala | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'plugins/gpgme-vala/src') diff --git a/plugins/gpgme-vala/src/gpgme_helper.vala b/plugins/gpgme-vala/src/gpgme_helper.vala index 4a6d94fa..f28bc6d6 100644 --- a/plugins/gpgme-vala/src/gpgme_helper.vala +++ b/plugins/gpgme-vala/src/gpgme_helper.vala @@ -144,28 +144,29 @@ private static Key? get_key(string sig, bool priv) throws GLib.Error { } private static string get_string_from_data(Data data) { + const size_t BUF_SIZE = 256; data.seek(0); - uint8[] buf = new uint8[256]; - ssize_t? len = null; + uint8[] buf = new uint8[BUF_SIZE + 1]; + ssize_t len = 0; string res = ""; do { - len = data.read(buf); + len = data.read(buf, BUF_SIZE); if (len > 0) { - string part = (string) buf; - part = part.substring(0, (long) len); - res += part; + buf[len] = 0; + res += (string) buf; } } while (len > 0); return res; } private static uint8[] get_uint8_from_data(Data data) { + const size_t BUF_SIZE = 256; data.seek(0); - uint8[] buf = new uint8[256]; - ssize_t? len = null; + uint8[] buf = new uint8[BUF_SIZE + 1]; + ssize_t len = 0; ByteArray res = new ByteArray(); do { - len = data.read(buf); + len = data.read(buf, BUF_SIZE); if (len > 0) { res.append(buf[0:len]); } -- cgit v1.2.3-54-g00ecf