DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e874097 am: a618c631d0
am: 0ec4728680  -s ours

Change-Id: Ibd4275cd15ab94ab0fe0434ea4d9ce4d68e5f253