Skip to content

Commit

Permalink
chore: Update valgrind suppressions after internal flatcc update (#613)
Browse files Browse the repository at this point in the history
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!)
  • Loading branch information
paleolimbot authored Sep 17, 2024
1 parent 2b9e624 commit 1c43700
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Verification
name: verify

on:
push:
Expand Down
7 changes: 4 additions & 3 deletions src/nanoarrow/ipc/writer.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ ArrowErrorCode ArrowIpcWriterWriteArrayStream(struct ArrowIpcWriter* writer,
struct ArrowArrayView array_view;
ArrowArrayViewInitFromType(&array_view, NANOARROW_TYPE_UNINITIALIZED);

NANOARROW_RETURN_NOT_OK(ArrowIpcWriterWriteArrayStreamImpl(writer, in, &schema, &array,
&array_view, error));
ArrowErrorCode result =
ArrowIpcWriterWriteArrayStreamImpl(writer, in, &schema, &array, &array_view, error);

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

ArrowArrayViewReset(&array_view);
return NANOARROW_OK;

return result;
}

#define NANOARROW_IPC_FILE_PADDED_MAGIC "ARROW1\0"
Expand Down
7 changes: 0 additions & 7 deletions valgrind.supp
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,3 @@
fun:base64_encode
fun:R_base64_encode
}

# TODO https://github.com/apache/arrow-nanoarrow/issues/579 remove this
{
<flatcc>:flatcc uses realloc() and valgrind thinks something was free'd
Memcheck:Addr4
fun:flatcc_builder_create_cached_vtable
}

0 comments on commit 1c43700

Please sign in to comment.