libxslt-1.1.26-id-generation.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001
  2. From: Daniel Veillard <veillard@redhat.com>
  3. Date: Tue, 22 Feb 2011 02:14:23 +0000
  4. Subject: Fix generate-id() to not expose object addresses
  5. As pointed out by Chris Evans <scarybeasts@gmail.com> it's better
  6. security wise to not expose object addresses directly, use a diff
  7. w.r.t. the document root own address to avoid this
  8. * libxslt/functions.c: fix IDs generation code
  9. ---
  10. diff --git a/libxslt/functions.c b/libxslt/functions.c
  11. index 4720c7a..de962f4 100644
  12. --- a/libxslt/functions.c
  13. +++ b/libxslt/functions.c
  14. @@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
  15. void
  16. xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
  17. xmlNodePtr cur = NULL;
  18. - unsigned long val;
  19. - xmlChar str[20];
  20. + long val;
  21. + xmlChar str[30];
  22. + xmlDocPtr doc;
  23. if (nargs == 0) {
  24. cur = ctxt->context->node;
  25. @@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
  26. * Okay this is ugly but should work, use the NodePtr address
  27. * to forge the ID
  28. */
  29. - val = (unsigned long)((char *)cur - (char *)0);
  30. - val /= sizeof(xmlNode);
  31. - sprintf((char *)str, "id%ld", val);
  32. + if (cur->type != XML_NAMESPACE_DECL)
  33. + doc = cur->doc;
  34. + else {
  35. + xmlNsPtr ns = (xmlNsPtr) cur;
  36. +
  37. + if (ns->context != NULL)
  38. + doc = ns->context;
  39. + else
  40. + doc = ctxt->context->doc;
  41. +
  42. + }
  43. +
  44. + val = (long)((char *)cur - (char *)doc);
  45. + if (val >= 0) {
  46. + sprintf((char *)str, "idp%ld", val);
  47. + } else {
  48. + sprintf((char *)str, "idm%ld", -val);
  49. + }
  50. valuePush(ctxt, xmlXPathNewString(str));
  51. }
  52. --
  53. cgit v0.8.3.4