am 481d5259: (-s ours) Revert "Fix buffer overwrite in png_build_index" DO NOT MERGE

* commit '481d5259a7f4368fabb385594c4b030ce1e6cf5f':
  Revert "Fix buffer overwrite in png_build_index" DO NOT MERGE