am dcf0db2c: (-s ours) Backport fix of buffer overwrite in png_build_index. DO NOT MERGE

* commit 'dcf0db2c568c7e85b913b97c3798a18289c84806':
  Backport fix of buffer overwrite in png_build_index. DO NOT MERGE