PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cast to smaller integer type 'int' from 'void *' (#2511)

Browse Source
This commit is contained in:
Dmitry Wagin 2021-05-26 20:23:27 +03:00 committed by GitHub
parent d552b33822
commit 9de0030439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/proc/native/proc_freebsd.c
View File

@ -3,11 +3,13 @@
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/user.h> #include <sys/user.h>
#include <sys/types.h>
#include <libprocstat.h> #include <libprocstat.h>
#include <libutil.h> #include <libutil.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include "proc_freebsd.h" #include "proc_freebsd.h"
@ -66,21 +68,23 @@ int find_status(int pid){
return (status); return (status);
} }
int get_entry_point(int pid) { uintptr_t get_entry_point(int pid) {
void *ep = NULL; void *ep = NULL;
errno = EINVAL;
struct procstat *ps = procstat_open_sysctl(); struct procstat *ps = procstat_open_sysctl();
if (ps == NULL) if (ps == NULL)
return -1; return 0;
uint cnt = 0; uint cnt = 0;
struct kinfo_proc *kipp = procstat_getprocs(ps, KERN_PROC_PID, pid, &cnt); struct kinfo_proc *kipp = procstat_getprocs(ps, KERN_PROC_PID, pid, &cnt);
if (cnt == 0) if (cnt == 0)
return -1; return 0;
Elf_Auxinfo *auxv = procstat_getauxv(ps, kipp, &cnt); Elf_Auxinfo *auxv = procstat_getauxv(ps, kipp, &cnt);
if (auxv == NULL) if (auxv == NULL)
return -1; return 0;
for (int i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {
if (auxv[i].a_type == AT_ENTRY) { if (auxv[i].a_type == AT_ENTRY) {
@ -89,5 +93,6 @@ int get_entry_point(int pid) {
} }
} }
procstat_freeauxv(ps, auxv); procstat_freeauxv(ps, auxv);
return (int)ep; errno = 0;
return (uintptr_t)ep;
} }

4
pkg/proc/native/proc_freebsd.h
View File

@ -1,4 +1,6 @@
#include <sys/types.h>
char * find_command_name(int pid); char * find_command_name(int pid);
char * find_executable(int pid); char * find_executable(int pid);
int find_status(int pid); int find_status(int pid);
int get_entry_point(int pid); uintptr_t get_entry_point(int pid);