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

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