Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-09 07:42:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix some null derefs in r2pipe C api

Browse Source
This commit is contained in:
pancake 2015-12-15 15:34:38 +01:00
parent 69b974eca3
commit 4180c8e439
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libr/socket/r2pipe.c
View File

@ -17,6 +17,7 @@ static void env(const char *s, int f) {
#endif #endif
R_API int r2p_close(R2Pipe *r2p) { R_API int r2p_close(R2Pipe *r2p) {
if (!r2p) return 0;
#if __WINDOWS__ && !defined(__CYGWIN__) #if __WINDOWS__ && !defined(__CYGWIN__)
if (r2p->pipe) { if (r2p->pipe) {
CloseHandle (r2p->pipe); CloseHandle (r2p->pipe);
@ -177,7 +178,10 @@ R_API char *r2p_cmdf(R2Pipe *r2p, const char *fmt, ...) {
} }
R_API int r2p_write(R2Pipe *r2p, const char *str) { R_API int r2p_write(R2Pipe *r2p, const char *str) {
int ret, len = strlen (str)+1; /* include \x00 */ int ret, len;
if (!r2p || !str)
return -1;
len = strlen (str)+1; /* include \x00 */
#if __WINDOWS__ && !defined(__CYGWIN__) #if __WINDOWS__ && !defined(__CYGWIN__)
DWORD dwWritten = -1; DWORD dwWritten = -1;
WriteFile (r2p->pipe, str, len, &dwWritten, NULL); WriteFile (r2p->pipe, str, len, &dwWritten, NULL);
@ -191,6 +195,7 @@ R_API int r2p_write(R2Pipe *r2p, const char *str) {
/* TODO: add timeout here ? */ /* TODO: add timeout here ? */
R_API char *r2p_read(R2Pipe *r2p) { R_API char *r2p_read(R2Pipe *r2p) {
char buf[1024]; char buf[1024];
if (!r2p) return NULL;
#if __WINDOWS__ && !defined(__CYGWIN__) #if __WINDOWS__ && !defined(__CYGWIN__)
BOOL bSuccess = FALSE; BOOL bSuccess = FALSE;
DWORD dwRead = 0; DWORD dwRead = 0;