arraybuf: fix dangling pointer and name workaround (#237)

nim-lang/Nim#24260 nim-lang/Nim#24261
status-im · Oct 8, 2024 · 45b0e9d · 45b0e9d
1 parent 763147c
commit 45b0e9d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/stew/arraybuf.nim b/stew/arraybuf.nim
@@ -56,14 +56,16 @@ template setLen*(b: var ArrayBuf, newLenParam: int) =
     b.n = nl
 
 template data*(bParam: ArrayBuf): openArray =
-  block:
-    bParam.evalOnceAs(b)
-    b.buf.toOpenArray(0, b.len() - 1)
+  # TODO https://github.com/nim-lang/Nim/issues/24260
+  # TODO https://github.com/nim-lang/Nim/issues/24261
+  bParam.evalOnceAs(bArrayBufPrivate)
+  bArrayBufPrivate.buf.toOpenArray(0, bArrayBufPrivate.len() - 1)
 
 template data*(bParam: var ArrayBuf): var openArray =
-  block:
-    bParam.evalOnceAs(b)
-    b.buf.toOpenArray(0, b.len() - 1)
+  # TODO https://github.com/nim-lang/Nim/issues/24260
+  # TODO https://github.com/nim-lang/Nim/issues/24261
+  bParam.evalOnceAs(bArrayBufPrivate)
+  bArrayBufPrivate.buf.toOpenArray(0, bArrayBufPrivate.len() - 1)
 
 iterator items*[N, T](b: ArrayBuf[N, T]): lent T =
   for i in 0 ..< b.len: