Skip to content

Commit 4af9259

Browse files
committed
fix: fix memory leak for recursive structs
Previously we did not delete the pointers of children of recursive structs, only their immediate member pointers. This commit fixes that issue. Note that this is currently handled as a special case and should be made general.
1 parent 171f292 commit 4af9259

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Concretize.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,10 @@ concreteDeleteTakePtr typeEnv env members =
902902
-- | Generate the C code for deleting a single member of the deftype.
903903
-- | TODO: Should return an Either since this can fail!
904904
memberDeletionGeneral :: String -> TypeEnv -> Env -> (String, Ty) -> String
905-
memberDeletionGeneral separator _ _ (memberName, (RecTy _)) =
906-
" " ++ "CARP_FREE(p" ++ separator ++ memberName ++ ");"
905+
memberDeletionGeneral separator _ _ (memberName, (RecTy t)) =
906+
" if(p"++ separator ++ memberName ++") {" ++ recur ++ "CARP_FREE(p" ++ separator ++ memberName ++ "); p" ++ separator ++ memberName ++ "= NULL;}"
907+
-- TODO: Brittle. Come up with a better solution.
908+
where recur = tyToC t ++ "_delete(*p" ++ separator ++ memberName ++ "); "
907909
memberDeletionGeneral separator typeEnv env (memberName, memberType) =
908910
case findFunctionForMember typeEnv env "delete" (typesDeleterFunctionType memberType) (memberName, memberType) of
909911
FunctionFound functionFullName -> " " ++ functionFullName ++ "(p" ++ separator ++ memberName ++ ");"

src/Managed.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ isManaged _ _ StringTy =
1717
True
1818
isManaged _ _ PatternTy =
1919
True
20-
isManaged _ _ (RecTy _) =
21-
True
2220
isManaged _ _ _ =
2321
False

0 commit comments

Comments
 (0)