Commit 77bae40d authored by Brian Young's avatar Brian Young Committed by Android (Google) Code Review
Browse files

Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into nyc-dev 

* changes:
  DO NOT MERGE: Heap buffer overflow in xmlAddID
  DO NOT MERGE: Add validation for eternal enities
  DO NOT MERGE: Use correct limit for port values
  DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@
  DO NOT MERGE: Fix XPointer paths beginning with range-to
  DO NOT MERGE: Disallow namespace nodes in XPointer ranges
  DO NOT MERGE: Apply upstream Chromium patch for encoding changes
parents 5ac7672b eb80f32c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment