Skip to content

Commit 1c43700

Browse files
authored
chore: Update valgrind suppressions after internal flatcc update (#613)
Also fixes a leak that was identified by the R bindings to the IPC writer. Closes #579 (apparently the flatcc update was sufficient to eliminate the suppression!)
1 parent 2b9e624 commit 1c43700

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

.github/workflows/verify.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Verification
18+
name: verify
1919

2020
on:
2121
push:

src/nanoarrow/ipc/writer.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ ArrowErrorCode ArrowIpcWriterWriteArrayStream(struct ArrowIpcWriter* writer,
350350
struct ArrowArrayView array_view;
351351
ArrowArrayViewInitFromType(&array_view, NANOARROW_TYPE_UNINITIALIZED);
352352

353-
NANOARROW_RETURN_NOT_OK(ArrowIpcWriterWriteArrayStreamImpl(writer, in, &schema, &array,
354-
&array_view, error));
353+
ArrowErrorCode result =
354+
ArrowIpcWriterWriteArrayStreamImpl(writer, in, &schema, &array, &array_view, error);
355355

356356
if (schema.release != NULL) {
357357
ArrowSchemaRelease(&schema);
@@ -362,7 +362,8 @@ ArrowErrorCode ArrowIpcWriterWriteArrayStream(struct ArrowIpcWriter* writer,
362362
}
363363

364364
ArrowArrayViewReset(&array_view);
365-
return NANOARROW_OK;
365+
366+
return result;
366367
}
367368

368369
#define NANOARROW_IPC_FILE_PADDED_MAGIC "ARROW1\0"

valgrind.supp

-7
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,3 @@
6666
fun:base64_encode
6767
fun:R_base64_encode
6868
}
69-
70-
# TODO https://github.com/apache/arrow-nanoarrow/issues/579 remove this
71-
{
72-
<flatcc>:flatcc uses realloc() and valgrind thinks something was free'd
73-
Memcheck:Addr4
74-
fun:flatcc_builder_create_cached_vtable
75-
}

0 commit comments

Comments
 (0)