ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pointer arith.

Browse source 
Sending 3digit code, null, binary-length and data.  Current code sends
3digit code, space, null, binary-length, binary-data.

The space should not be sent.

Change-Id: I1df00a3e70805b39b6105966c7f3c613461a6858
This commit is contained in:
Robert Greenwalt 2012-03-08 16:10:06 -08:00
parent b015977acb
commit 7599bfcf13
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/sysutils/SocketClient.h
View file

@ -45,14 +45,12 @@ public:
int sendMsg(int code, const char *msg, bool addErrno);
int sendMsg(int code, const char *msg, bool addErrno, bool useCmdNum);
// Provides a mechanism to send a response code to the client. The message uses
// the same format as in sendMsg method above.
// Sends the code, a space, and a null character.
// Provides a mechanism to send a response code to the client.
// Sends the code and a null character.
int sendCode(int code);
// Provides a mechanism to send binary data to client. The message uses the
// same format as in sendMsg method above.
// Sends the code, a space, and a null character, followed by 4 bytes of
// Provides a mechanism to send binary data to client.
// Sends the code and a null character, followed by 4 bytes of
// big-endian length, and the data.
int sendBinaryMsg(int code, const void *data, int len);

16
libsysutils/src/SocketClient.cpp
View file

@ -79,16 +79,16 @@ int SocketClient::sendMsg(int code, const char *msg, bool addErrno, bool useCmdN
return ret;
}
/** send 3-digit code, null, binary-length, binary data */
int SocketClient::sendBinaryMsg(int code, const void *data, int len) {
/* 5 bytes for the code & space + 4 bytes for the len */
char buf[9];
/* 4 bytes for the code & null + 4 bytes for the len */
char buf[8];
/* Write the code */
snprintf(buf, 5, "%.3d ", code);
snprintf(buf, 4, "%.3d", code);
/* Write the len */
uint32_t tmp = htonl(len);
memcpy(buf + 5, &tmp, sizeof(uint32_t));
memcpy(buf + 4, &tmp, sizeof(uint32_t));
pthread_mutex_lock(&mWriteMutex);
int result = sendDataLocked(buf, sizeof(buf));
@ -102,9 +102,9 @@ int SocketClient::sendBinaryMsg(int code, const void *data, int len) {
// Sends the code (c-string null-terminated).
int SocketClient::sendCode(int code) {
char buf[5];
snprintf(buf, 5, "%.3d ", code);
return sendData(buf, 5);
char buf[4];
snprintf(buf, sizeof(buf), "%.3d", code);
return sendData(buf, sizeof(buf));
}
int SocketClient::sendMsg(const char *msg) {