tree e3cbe97a1d980dc43437d23bfc8e6b68f0a98e33
parent 9dddf651ebc622db16467626ae0f5995d11e246f
parent 5e12401790abb7416c1a27ff077e0a823e8cefd8
author Geremy Condra <gcondra@google.com> 1335202272 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335202272 -0700

Merge "Revise png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048)"