diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-29 18:36:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-29 18:36:33 +0000 |
| commit | ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4 (patch) | |
| tree | 1f81a0fd8d7b703691eb5b2b15099683abfde1c6 /adb/services.c | |
| parent | 3617bdf3ef2084c2df19d1fa4ae802b832c79c2a (diff) | |
| parent | 47a123895b11702e25ea217860ad173434ebfa6c (diff) | |
| download | system_core-ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4.zip system_core-ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4.tar.gz system_core-ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4.tar.bz2 | |
am 47a12389: Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break."
* commit '47a123895b11702e25ea217860ad173434ebfa6c':
Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
Diffstat (limited to 'adb/services.c')
| -rw-r--r-- | adb/services.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/adb/services.c b/adb/services.c index 528585a..2c20b81 100644 --- a/adb/services.c +++ b/adb/services.c @@ -206,7 +206,6 @@ static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg fprintf(stderr, "error: create_subproc_pty not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1); return -1; #else /* !HAVE_WIN32_PROC */ - char *devname; int ptm; ptm = unix_open("/dev/ptmx", O_RDWR | O_CLOEXEC); // | O_NOCTTY); @@ -215,8 +214,8 @@ static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg return -1; } - if(grantpt(ptm) || unlockpt(ptm) || - ((devname = (char*) ptsname(ptm)) == 0)){ + char devname[64]; + if(grantpt(ptm) || unlockpt(ptm) || ptsname_r(ptm, devname, sizeof(devname)) != 0) { printf("[ trouble with /dev/ptmx - %s ]\n", strerror(errno)); adb_close(ptm); return -1; |