From 3ffa26543ff4c31aa7884be1ba0b4816082766e9 Mon Sep 17 00:00:00 2001
From: Justin Willmert <justin@willmert.me>
Date: Sun, 1 Nov 2020 12:31:01 -0600
Subject: [PATCH] Skip over function handles in v7.3 format

This is similar to #129 which returns `missing` for unhandled data
types in HDF5 Datasets; function handles are stored as HDF5 groups, so
a different explicit check is required to skip over them.
---
 src/MAT_HDF5.jl                |   3 +++
 test/read.jl                   |   9 ++++++++-
 test/v7.3/function_handles.mat | Bin 0 -> 21808 bytes
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test/v7.3/function_handles.mat

diff --git a/src/MAT_HDF5.jl b/src/MAT_HDF5.jl
index 2ecd258..63cbf5c 100644
--- a/src/MAT_HDF5.jl
+++ b/src/MAT_HDF5.jl
@@ -229,6 +229,9 @@ function m_read(g::HDF5Group)
                 data = str2eltype_matlab[mattype][]
             end
             return SparseMatrixCSC(convert(Int, HDF5.a_read(g, sparse_attr_matlab)), length(jc)-1, jc, ir, data)
+        elseif mattype == "function_handle"
+            @warn "MATLAB $mattype values are currently not supported"
+            return missing
         else
             error("Cannot read from a non-struct group, type was $mattype")
         end
diff --git a/test/read.jl b/test/read.jl
index e1f388b..866e631 100644
--- a/test/read.jl
+++ b/test/read.jl
@@ -213,9 +213,16 @@ let objtestfile = "figure.fig"
     @test vars["hgS_070000"]["type"] == "figure"
 end
 
-# test reading file containing Matlab table and datetime objects
+# test reading file containing Matlab function handle, table, and datetime objects
 # since we don't support these objects, just make sure that there are no errors
 # reading the file and that the variables are there and replaced with `missing`
+let objtestfile = "function_handles.mat"
+    vars = matread(joinpath(dirname(@__FILE__), "v7.3", objtestfile))
+    @test "sin" in keys(vars)
+    @test ismissing(vars["sin"])
+    @test "anonymous" in keys(vars)
+    @test ismissing(vars["anonymous"])
+end
 let objtestfile = "struct_table_datetime.mat"
     vars = matread(joinpath(dirname(@__FILE__), "v7.3", objtestfile))["s"]
     @test "testTable" in keys(vars)
diff --git a/test/v7.3/function_handles.mat b/test/v7.3/function_handles.mat
new file mode 100644
index 0000000000000000000000000000000000000000..39e2b598c5d09db00f4ab65ab75628877873f7b1
GIT binary patch
literal 21808
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
Z(wzQh-azPx{<i^Cuw+<=1aDt`>VJ~XJu3hJ

literal 0
HcmV?d00001