DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e874097
am: a618c631d0

Change-Id: I3c8e70eb5effa156c10944cfea20c9095a6d1175