Fix a possible collisions by hashing pointers with the format %u

[perl/modules/indirect.git] / indirect.xs

diff --git a/indirect.xs b/indirect.xs
index c89c8b9d0080aee0aec716c668885e640674c65c..c90f3b67e0d63d539aeeb2358c9bef232bc38c05 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -87,11 +87,14 @@ STATIC IV indirect_hint(pTHX) {
 STATIC HV *indirect_map = NULL;
 STATIC const char *indirect_linestr = NULL;
 
-#define OP2STR(O) (sprintf(buf, "%u", PTR2UV(o)))
+/* We need (CHAR_BIT * sizeof(UV)) / 4 + 1 chars, but it's just better to take
+ * a power of two */
+#define OP2STR_BUF char buf[(CHAR_BIT * sizeof(UV)) / 2]
+#define OP2STR(O)  (sprintf(buf, "%"UVxf, PTR2UV(O)))
 
 STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
 #define indirect_map_store(O, S, N) indirect_map_store(aTHX_ (O), (S), (N))
- char buf[32];
+ OP2STR_BUF;
  const char *pl_linestr;
  SV *val;
 
@@ -117,7 +120,7 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
 
 STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
 #define indirect_map_fetch(O, S) indirect_map_fetch(aTHX_ (O), (S))
- char buf[32];
+ OP2STR_BUF;
  SV **val;
 
  if (indirect_linestr != SvPVX_const(PL_linestr))
@@ -135,24 +138,28 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
 
 STATIC void indirect_map_delete(pTHX_ const OP *o) {
 #define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
- char buf[32];
+ OP2STR_BUF;
 
  hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
 }
 
-STATIC void indirect_map_clean(pTHX_ const OP *o) {
-#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+STATIC void indirect_map_clean_kids(pTHX_ const OP *o) {
+#define indirect_map_clean_kids(O) indirect_map_clean_kids(aTHX_ (O))
  if (o->op_flags & OPf_KIDS) {
   const OP *kid = cUNOPo->op_first;
   for (; kid; kid = kid->op_sibling) {
+   indirect_map_clean_kids(kid);
    indirect_map_delete(kid);
-   indirect_map_clean(kid);
   }
- } else {
-  indirect_map_delete(o);
  }
 }
 
+STATIC void indirect_map_clean(pTHX_ const OP *o) {
+#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+ indirect_map_clean_kids(o);
+ indirect_map_delete(o);
+}
+
 STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
 #define indirect_find(N, S) indirect_find(aTHX_ (N), (S))
  STRLEN len;