diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc
index 4d473221a..73aab5816 100644
--- a/rtexif/rtexif.cc
+++ b/rtexif/rtexif.cc
@@ -569,7 +569,11 @@ TagDirectoryTable::TagDirectoryTable (TagDirectory* p, unsigned char *v,int mems
 {
     values = new unsigned char[valuesSize];
     memcpy(values,v,valuesSize);
-    for( const TagAttrib* tattr = ta; tattr->ignore != -1; tattr++){
+
+    // Security ; will avoid to read above the buffer limit if the RT's tagDirectoryTable is longer that what's in the file
+    int count = valuesSize/getTypeSize(type);
+
+    for(const TagAttrib* tattr = ta; tattr->ignore != -1 && tattr->ID<count; ++tattr){
         Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type);
         tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning
     }
@@ -581,7 +585,10 @@ TagDirectoryTable::TagDirectoryTable (TagDirectory* p, FILE* f, int memsize,int
     values = new unsigned char[valuesSize];
     fread (values, 1, valuesSize, f);
 
-    for( const TagAttrib* tattr = ta; tattr->ignore != -1; tattr++){
+    // Security ; will avoid to read above the buffer limit if the RT's tagDirectoryTable is longer that what's in the file
+    int count = valuesSize/getTypeSize(type);
+
+    for(const TagAttrib* tattr = ta; tattr->ignore != -1 && tattr->ID<count; ++tattr){
         Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type);
         tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning
     }
diff --git a/rtexif/rtexif.h b/rtexif/rtexif.h
index 1dd944307..eb48acdb8 100644
--- a/rtexif/rtexif.h
+++ b/rtexif/rtexif.h
@@ -431,7 +431,7 @@ protected:
     }
 };
 
-inline int getTypeSize( TagType type );
+inline static int getTypeSize( TagType type );
 
 extern const TagAttrib exifAttribs[];
 extern const TagAttrib gpsAttribs[];