Merge GH #1158 Add build mode for fuzzer tests

2 files changed, 9 insertions, 3 deletions

diff --git a/src/lib/asn1/ber_dec.cpp b/src/lib/asn1/ber_dec.cpp
index bf728a8e8..67a2c9d8e 100644
--- a/src/lib/asn1/ber_dec.cpp
+++ b/src/lib/asn1/ber_dec.cpp
@@ -544,7 +544,9 @@ BER_Decoder& BER_Decoder::decode(secure_vector<uint8_t>& buffer,
          throw BER_Decoding_Error("Bad number of unused bits in BIT STRING");
 
       buffer.resize(obj.value.size() - 1);
-      copy_mem(buffer.data(), &obj.value[1], obj.value.size() - 1);
+
+      if(obj.value.size() > 1)
+         copy_mem(buffer.data(), &obj.value[1], obj.value.size() - 1);
       }
    return (*this);
    }
@@ -569,7 +571,9 @@ BER_Decoder& BER_Decoder::decode(std::vector<uint8_t>& buffer,
          throw BER_Decoding_Error("Bad number of unused bits in BIT STRING");
 
       buffer.resize(obj.value.size() - 1);
-      copy_mem(buffer.data(), &obj.value[1], obj.value.size() - 1);
+
+      if(obj.value.size() > 1)
+         copy_mem(buffer.data(), &obj.value[1], obj.value.size() - 1);
       }
    return (*this);
    }
diff --git a/src/lib/prov/openssl/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp
index 58a09cb0d..b1c73d851 100644
--- a/src/lib/prov/openssl/openssl_rsa.cpp
+++ b/src/lib/prov/openssl/openssl_rsa.cpp
@@ -171,7 +171,9 @@ class OpenSSL_RSA_Verification_Operation : public PK_Ops::Verification_with_EMSA
             throw Invalid_Argument("OpenSSL RSA verify input too large");
 
          secure_vector<uint8_t> inbuf(mod_sz);
-         copy_mem(&inbuf[mod_sz - msg_len], msg, msg_len);
+
+         if(msg_len > 0)
+            copy_mem(&inbuf[mod_sz - msg_len], msg, msg_len);
 
          secure_vector<uint8_t> outbuf(mod_sz);