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

Change-Id: I6e432c1f29cfed9f8952811a216a565b9861d974