Skip to contentSkip to conversation

fsm-listen-darwin: free corefoundation paths

PATCH Superseded AZero13 via GitGitGadget 1 participant 2 messages Dec 18, 2025

lore
Share & tools
lore

AZero13 via GitGitGadget

author
#0 lore raw

PATCH 1/1 fsm-listen-darwin: free corefoundation paths

From: AZero13 <[email protected]>

They are not freed even though they should be.

Signed-off-by Greg Funni <[email protected]>

---
fsm-listen-darwin: free corefoundation paths

They are not freed even though they should be.

Signed-off-by Greg Funni [email protected]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2129%2FAZero13%2Ffixs-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2129/AZero13/fixs-v1
Pull-Request: https://github.com/git/git/pull/2129

 compat/fsmonitor/fsm-darwin-gcc.h    |  2 ++
 compat/fsmonitor/fsm-listen-darwin.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
compat/fsmonitor/fsm-darwin-gcc.h +2 -0
index 3496e29b3a..8b4bc3a5bc 100644
@@ -40,6 +40,7 @@ typedef const FSEventStreamRef ConstFSEventStreamRef;
 typedef unsigned int CFStringEncoding;
 #define kCFStringEncodingUTF8 0x08000100
 
+typedef const void *CFTypeRef;
 typedef const struct __CFString *CFStringRef;
 typedef const struct __CFArray *CFArrayRef;
 typedef const struct __CFRunLoop *CFRunLoopRef;

@@ -76,6 +77,7 @@ CFStringRef CFStringCreateWithCString(void *allocator, const char *string,
 				      CFStringEncoding encoding);
 CFArrayRef CFArrayCreate(void *allocator, const void **items, long long count,
 			 void *callbacks);
+void CFRelease(CFTypeRef cf);
 void CFRunLoopRun(void);
 void CFRunLoopStop(CFRunLoopRef run_loop);
 CFRunLoopRef CFRunLoopGetCurrent(void);
compat/fsmonitor/fsm-listen-darwin.c +14 -0
index 43c3a915a0..149c310433 100644
@@ -455,6 +455,13 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 failed:
 	error(_("Unable to create FSEventStream."));
 
+	if (data->cfar_paths_to_watch)
+		CFRelease(data->cfar_paths_to_watch);
+	if (data->cfsr_gitdir_path)
+		CFRelease(data->cfsr_gitdir_path);
+	if (data->cfsr_worktree_path)
+		CFRelease(data->cfsr_worktree_path);
+
 	FREE_AND_NULL(state->listen_data);
 	return -1;
 }

@@ -476,6 +483,13 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
 		FSEventStreamRelease(data->stream);
 	}
 
+	if (data->cfar_paths_to_watch)
+		CFRelease(data->cfar_paths_to_watch);
+	if (data->cfsr_gitdir_path)
+		CFRelease(data->cfsr_gitdir_path);
+	if (data->cfsr_worktree_path)
+		CFRelease(data->cfsr_worktree_path);
+
 	if (data->dq)
 		dispatch_release(data->dq);
 	pthread_cond_destroy(&data->dq_finished);

base-commit: c4a0c8845e2426375ad257b6c221a3a7d92ecfda

Signature · 1 line
gitgitgadget
author
#1 lore raw

PATCH v2 1/1 fsm-listen-darwin: free corefoundation paths

From: Greg Funni <[email protected]>

They are not freed even though they should be.

Signed-off-by Greg Funni <[email protected]>

---
fsm-listen-darwin: free corefoundation paths

They are not freed even though they should be.

Signed-off-by Greg Funni [email protected]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2129%2FAZero13%2Ffixs-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2129/AZero13/fixs-v2
Pull-Request: https://github.com/git/git/pull/2129

Range-diff vs v1:

1: 164c091f1c ! 1: 90d8f11554 fsm-listen-darwin: free corefoundation paths
@@
## Metadata ##
-Author: AZero13 <[email protected]>
+Author: Greg Funni <[email protected]>

## Commit message ##
fsm-listen-darwin: free corefoundation paths

 compat/fsmonitor/fsm-darwin-gcc.h    |  2 ++
 compat/fsmonitor/fsm-listen-darwin.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
compat/fsmonitor/fsm-darwin-gcc.h +2 -0
index 3496e29b3a..8b4bc3a5bc 100644
@@ -40,6 +40,7 @@ typedef const FSEventStreamRef ConstFSEventStreamRef;
 typedef unsigned int CFStringEncoding;
 #define kCFStringEncodingUTF8 0x08000100
 
+typedef const void *CFTypeRef;
 typedef const struct __CFString *CFStringRef;
 typedef const struct __CFArray *CFArrayRef;
 typedef const struct __CFRunLoop *CFRunLoopRef;

@@ -76,6 +77,7 @@ CFStringRef CFStringCreateWithCString(void *allocator, const char *string,
 				      CFStringEncoding encoding);
 CFArrayRef CFArrayCreate(void *allocator, const void **items, long long count,
 			 void *callbacks);
+void CFRelease(CFTypeRef cf);
 void CFRunLoopRun(void);
 void CFRunLoopStop(CFRunLoopRef run_loop);
 CFRunLoopRef CFRunLoopGetCurrent(void);
compat/fsmonitor/fsm-listen-darwin.c +14 -0
index 43c3a915a0..149c310433 100644
@@ -455,6 +455,13 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
 failed:
 	error(_("Unable to create FSEventStream."));
 
+	if (data->cfar_paths_to_watch)
+		CFRelease(data->cfar_paths_to_watch);
+	if (data->cfsr_gitdir_path)
+		CFRelease(data->cfsr_gitdir_path);
+	if (data->cfsr_worktree_path)
+		CFRelease(data->cfsr_worktree_path);
+
 	FREE_AND_NULL(state->listen_data);
 	return -1;
 }

@@ -476,6 +483,13 @@ void fsm_listen__dtor(struct fsmonitor_daemon_state *state)
 		FSEventStreamRelease(data->stream);
 	}
 
+	if (data->cfar_paths_to_watch)
+		CFRelease(data->cfar_paths_to_watch);
+	if (data->cfsr_gitdir_path)
+		CFRelease(data->cfsr_gitdir_path);
+	if (data->cfsr_worktree_path)
+		CFRelease(data->cfsr_worktree_path);
+
 	if (data->dq)
 		dispatch_release(data->dq);
 	pthread_cond_destroy(&data->dq_finished);

base-commit: c4a0c8845e2426375ad257b6c221a3a7d92ecfda

Signature · 1 line
gitgitgadget