diff --git a/src/repacketizer.c b/src/repacketizer.c
index a62675ce940e8b2421dc547f242c51de282f8ee2..f27e9ab9582ca86e351d395c75ad1878def1ecb6 100644
--- a/src/repacketizer.c
+++ b/src/repacketizer.c
@@ -219,8 +219,9 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
    }
    if (pad)
    {
-      for (i=ptr-data;i<maxlen;i++)
-         data[i] = 0;
+      /* Fill padding with zeros. */
+      while (ptr<data+maxlen)
+         *ptr++=0;
    }
    return tot_size;
 }