diff --git a/src/types.cpp b/src/types.cpp
index 6559e20f4d..1c6963cda4 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -173,7 +173,7 @@ byte* Exiv2::DataBuf::data(size_t offset) {
 }
 
 const byte* Exiv2::DataBuf::c_data(size_t offset) const {
-  if (pData_.empty()) {
+  if (pData_.empty() || offset == pData_.size()) {
     return nullptr;
   }
   if (offset > pData_.size()) {