| Index: runtime/bin/directory_android.cc
|
| diff --git a/runtime/bin/directory_android.cc b/runtime/bin/directory_android.cc
|
| index 6571f18f86008e0e87e1cb40731747a58439fe92..bb190b2b4ca8374d03bdd2d76afc09c9cb43289b 100644
|
| --- a/runtime/bin/directory_android.cc
|
| +++ b/runtime/bin/directory_android.cc
|
| @@ -366,9 +366,8 @@ Directory::ExistsResult Directory::Exists(const char* dir_name) {
|
| char* Directory::CurrentNoScope() {
|
| // Android's getcwd adheres closely to the POSIX standard. It won't
|
| // allocate memory. We need to make our own copy.
|
| -
|
| char buffer[PATH_MAX];
|
| - if (NULL == getcwd(buffer, PATH_MAX)) {
|
| + if (getcwd(buffer, PATH_MAX) == NULL) {
|
| return NULL;
|
| }
|
|
|
| @@ -377,15 +376,17 @@ char* Directory::CurrentNoScope() {
|
|
|
|
|
| const char* Directory::Current() {
|
| - char* result = DartUtils::ScopedCString(PATH_MAX);
|
| - ASSERT(result != NULL);
|
| - return getcwd(result, PATH_MAX);
|
| + char buffer[PATH_MAX];
|
| + if (getcwd(buffer, PATH_MAX) == NULL) {
|
| + return NULL;
|
| + }
|
| + return DartUtils::ScopedCopyCString(buffer);
|
| }
|
|
|
|
|
| bool Directory::SetCurrent(const char* path) {
|
| int result = NO_RETRY_EXPECTED(chdir(path));
|
| - return result == 0;
|
| + return (result == 0);
|
| }
|
|
|
|
|
|
|