Merge "Fix buffer overwrite in png_build_index"