0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
  2. From: Dave Beckett <dave@dajobe.org>
  3. Date: Sun, 16 Apr 2017 23:15:12 +0100
  4. Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
  5. (raptor_xml_writer_start_element_common): Calculate max including for
  6. each attribute a potential name and value.
  7. Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
  8. and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
  9. [Peter: fixes CVE-2017-18926, upstream:
  10. https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f]
  11. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  12. ---
  13. src/raptor_xml_writer.c | 7 ++++---
  14. 1 file changed, 4 insertions(+), 3 deletions(-)
  15. diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
  16. index 693b9468..0d3a36a5 100644
  17. --- a/src/raptor_xml_writer.c
  18. +++ b/src/raptor_xml_writer.c
  19. @@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
  20. size_t nspace_declarations_count = 0;
  21. unsigned int i;
  22. - /* max is 1 per element and 1 for each attribute + size of declared */
  23. if(nstack) {
  24. - int nspace_max_count = element->attribute_count+1;
  25. + int nspace_max_count = element->attribute_count * 2; /* attr and value */
  26. + if(element->name->nspace)
  27. + nspace_max_count++;
  28. if(element->declared_nspaces)
  29. nspace_max_count += raptor_sequence_size(element->declared_nspaces);
  30. if(element->xml_language)
  31. @@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
  32. }
  33. }
  34. - /* Add the attribute + value */
  35. + /* Add the attribute's value */
  36. nspace_declarations[nspace_declarations_count].declaration=
  37. raptor_qname_format_as_xml(element->attributes[i],
  38. &nspace_declarations[nspace_declarations_count].length);
  39. --
  40. 2.20.1