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

Change-Id: I353b9388be84c4ef38d0c52fe271958a7e16f37a