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

Commit af39885c authored by Huihong Luo's avatar Huihong Luo
Browse files

Fix bug #37284906, adb shell crashes on windows with invalid options. 

For example, "adb.exe shell -list" crashes without this fix.
Test: adb.exe shell -list-packages

Change-Id: I96be44128ff3ecab7804b70074cbde630b3fc3d1
parent e3e4ec7c

adb/commandline.cpp

+4 −0
Original line number Diff line number Diff line
@@ -685,6 +685,10 @@ static int adb_shell(int argc, const char** argv) { 


    // Parse shell-specific command-line options.

    argv[0] = "adb shell"; // So getopt(3) error messages start "adb shell".

#ifdef _WIN32

    // fixes "adb shell -l" crash on Windows, b/37284906

    __argv = const_cast<char**>(argv);

#endif

    optind = 1; // argv[0] is always "shell", so set `optind` appropriately.

    int opt;

    while ((opt = getopt(argc, const_cast<char**>(argv), "+e:ntTx")) != -1) {