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

Change-Id: Ie4cc090745ae044b8e4802cdc78079dd8aeb0018