diff --git a/common/class_bitmap_base.cpp b/common/class_bitmap_base.cpp
index d570d6c5fc..9c118a129d 100644
--- a/common/class_bitmap_base.cpp
+++ b/common/class_bitmap_base.cpp
@@ -107,9 +107,8 @@ bool BITMAP_BASE::SaveData( FILE* aFile ) const
         // Write binary data in hexadecimal form (ASCII)
         wxStreamBuffer* buffer = stream.GetOutputStreamBuffer();
         char*           begin  = (char*) buffer->GetBufferStart();
-        int             ii;
 
-        for( ii = 0; begin <= buffer->GetBufferEnd(); begin++, ii++ )
+        for( int ii = 0; begin < buffer->GetBufferEnd(); begin++, ii++ )
         {
             if( ii >= 32 )
             {
@@ -140,7 +139,7 @@ void BITMAP_BASE::SaveData( wxArrayString& aPngStrings ) const
         char*           begin  = (char*) buffer->GetBufferStart();
         wxString        line;
 
-        for( int ii = 0; begin <= buffer->GetBufferEnd(); begin++, ii++ )
+        for( int ii = 0; begin < buffer->GetBufferEnd(); begin++, ii++ )
         {
             if( ii >= 32 )
             {