DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b516f  -s ours am: da1480747f
am: ce2a7a6fad  -s ours

Change-Id: Ib82b337261f8d7f05105a69fc899802bd0845f27