projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0c8bf2
)
fixed null pointer crash when passing NULL to putsock/write_socket
author
pk910
<philipp@zoelle1.de>
Sun, 4 Dec 2011 21:43:41 +0000
(22:43 +0100)
committer
pk910
<philipp@zoelle1.de>
Sun, 4 Dec 2011 21:43:41 +0000
(22:43 +0100)
src/ClientSocket.c
patch
|
blob
|
history
diff --git
a/src/ClientSocket.c
b/src/ClientSocket.c
index 1a3d94984279b477265f42dd5a3d8eec55df0582..a46a4bf82d1bbc2e4d1b4ab8c64436c99e0a0f52 100644
(file)
--- a/
src/ClientSocket.c
+++ b/
src/ClientSocket.c
@@
-220,7
+220,7
@@
int write_socket_force(struct ClientSocket *client, char* msg, int len) {
}
int write_socket(struct ClientSocket *client, char* msg, int len) {
}
int write_socket(struct ClientSocket *client, char* msg, int len) {
- if(!(client
->flags & SOCKET_FLAG_CONNECTED
)) return 0;
+ if(!(client
&& (client->flags & SOCKET_FLAG_CONNECTED)
)) return 0;
if(client->flags & SOCKET_FLAG_USE_QUEUE)
return queue_add(client, msg, len);
else
if(client->flags & SOCKET_FLAG_USE_QUEUE)
return queue_add(client, msg, len);
else
@@
-302,7
+302,7
@@
putsock(struct ClientSocket *client, const char *text, ...)
va_list arg_list;
char sendBuf[MAXLEN];
int pos;
va_list arg_list;
char sendBuf[MAXLEN];
int pos;
- if (!(client
->flags & SOCKET_FLAG_CONNECTED
)) return;
+ if (!(client
&& (client->flags & SOCKET_FLAG_CONNECTED)
)) return;
sendBuf[0] = '\0';
va_start(arg_list, text);
pos = vsnprintf(sendBuf, MAXLEN - 2, text, arg_list);
sendBuf[0] = '\0';
va_start(arg_list, text);
pos = vsnprintf(sendBuf, MAXLEN - 2, text, arg_list);