diff --git a/proc/proc_darwin.c b/proc/proc_darwin.c
index 4d17c54d..30ea8c76 100644
--- a/proc/proc_darwin.c
+++ b/proc/proc_darwin.c
@@ -76,7 +76,7 @@ find_executable(int pid) {
 }
 
 kern_return_t
-get_threads(task_t task, void *slice) {
+get_threads(task_t task, void *slice, int limit) {
 	kern_return_t kret;
 	thread_act_array_t list;
 	mach_msg_type_number_t count;
@@ -86,6 +86,11 @@ get_threads(task_t task, void *slice) {
 		return kret;
 	}
 
+	if (count > limit) {
+		vm_deallocate(mach_task_self(), (vm_address_t) list, count * sizeof(list[0]));
+		return -2;
+	}
+
 	memcpy(slice, (void*)list, count*sizeof(list[0]));
 
 	kret = vm_deallocate(mach_task_self(), (vm_address_t) list, count * sizeof(list[0]));
diff --git a/proc/proc_darwin.go b/proc/proc_darwin.go
index fa291be2..995a1ea0 100644
--- a/proc/proc_darwin.go
+++ b/proc/proc_darwin.go
@@ -138,20 +138,25 @@ func (dbp *Process) updateThreadList() error {
 	var (
 		err   error
 		kret  C.kern_return_t
-		count = C.thread_count(C.task_t(dbp.os.task))
+		count C.int
+		list  []uint32
 	)
-	if count == -1 {
-		return fmt.Errorf("could not get thread count")
-	}
-	list := make([]uint32, count)
 
-	// TODO(dp) might be better to malloc mem in C and then free it here
-	// instead of getting count above and passing in a slice
-	kret = C.get_threads(C.task_t(dbp.os.task), unsafe.Pointer(&list[0]))
-	if kret != C.KERN_SUCCESS {
-		return fmt.Errorf("could not get thread list")
+	for {
+		count = C.thread_count(C.task_t(dbp.os.task))
+		if count == -1 {
+			return fmt.Errorf("could not get thread count")
+		}
+		list = make([]uint32, count)
+
+		// TODO(dp) might be better to malloc mem in C and then free it here
+		// instead of getting count above and passing in a slice
+		kret = C.get_threads(C.task_t(dbp.os.task), unsafe.Pointer(&list[0]), count)
+		if kret != -2 {
+			break
+		}
 	}
-	if count < 0 {
+	if kret != C.KERN_SUCCESS {
 		return fmt.Errorf("could not get thread list")
 	}
 
diff --git a/proc/proc_darwin.h b/proc/proc_darwin.h
index 0df0ea4f..1598cdf9 100644
--- a/proc/proc_darwin.h
+++ b/proc/proc_darwin.h
@@ -30,7 +30,7 @@ char *
 find_executable(int pid);
 
 kern_return_t
-get_threads(task_t task, void *);
+get_threads(task_t task, void *data,int limit);
 
 int
 thread_count(task_t task);
@@ -43,4 +43,3 @@ mach_send_reply(mach_msg_header_t);
 
 kern_return_t
 raise_exception(mach_port_t, mach_port_t, mach_port_t, exception_type_t);
-