tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Increase the maximum shell command length to 4096ish." am: 3472410eac

Browse source 
am: 2783126cab

* commit '2783126cab5ca2a1aae5779c988a84abff97cb19':
  Increase the maximum shell command length to 4096ish.
This commit is contained in:
Josh Gao 2016-01-15 23:58:13 +00:00 committed by android-build-merger
commit c93cf8a75e
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/adb.cpp
View file

@ -857,8 +857,7 @@ int handle_forward_request(const char* service, TransportType type, const char*
#if ADB_HOST
SendOkay(reply_fd);
#endif
SendProtocolString(reply_fd, listeners);
return 1;
return SendProtocolString(reply_fd, listeners);
}
if (!strcmp(service, "killforward-all")) {

2
adb/adb_client.cpp
View file

@ -124,7 +124,7 @@ bool adb_status(int fd, std::string* error) {
int _adb_connect(const std::string& service, std::string* error) {
D("_adb_connect: %s", service.c_str());
if (service.empty() || service.size() > 1024) {
if (service.empty() || service.size() > MAX_PAYLOAD_V1) {
*error = android::base::StringPrintf("bad service name length (%zd)",
service.size());
return -1;

8
adb/adb_io.cpp
View file

@ -22,14 +22,16 @@
#include <android-base/stringprintf.h>
#include "adb.h"
#include "adb_trace.h"
#include "adb_utils.h"
#include "sysdeps.h"
bool SendProtocolString(int fd, const std::string& s) {
int length = s.size();
if (length > 0xffff) {
length = 0xffff;
unsigned int length = s.size();
if (length > MAX_PAYLOAD_V1 - 4) {
errno = EMSGSIZE;
return false;
}
// The cost of sending two strings outweighs the cost of formatting.

6
adb/sockets.cpp
View file

@ -698,17 +698,17 @@ static int smart_socket_enqueue(asocket *s, apacket *p)
p = s->pkt_first;
}
/* don't bother if we can't decode the length */
/* don't bother if we can't decode the length */
if(p->len < 4) return 0;
len = unhex(p->data, 4);
if((len < 1) || (len > 1024)) {
if ((len < 1) || (len > MAX_PAYLOAD_V1)) {
D("SS(%d): bad size (%d)", s->id, len);
goto fail;
}
D("SS(%d): len is %d", s->id, len );
/* can't do anything until we have the full header */
/* can't do anything until we have the full header */
if((len + 4) > p->len) {
D("SS(%d): waiting for %d more bytes", s->id, len+4 - p->len);
return 0;