Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b63cff4 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge "adb: avoid freeing argv entries on Windows."

parents bc1ccde8 e72c44b2
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -2606,7 +2606,9 @@ extern "C" int main(int argc, char** argv);
extern "C" int wmain(int argc, wchar_t **argv) {
    // Convert args from UTF-16 to UTF-8 and pass that to main().
    NarrowArgs narrow_args(argc, argv);
    return main(argc, narrow_args.data());

    // Avoid destructing NarrowArgs: argv might have been mutated to point to string literals.
    _exit(main(argc, narrow_args.data()));
}

// Shadow UTF-8 environment variable name/value pairs that are created from