Commit b877fc2e authored by stransky's avatar stransky
Browse files

Bug 1835631 [Linux] Pass correct array size to ConstructCommandLine() r=emilio a=pascalc 

Differential Revision: https://phabricator.services.mozilla.com/D179354
parent 3018b52a

browser/components/shell/nsGNOMEShellDBusHelper.cpp

+5 −3
Original line number Diff line number Diff line
@@ -354,9 +354,10 @@ static void ActivateResultID( 


  if (strncmp(aResultID, KEYWORD_SEARCH_STRING, KEYWORD_SEARCH_STRING_LEN) ==

      0) {

    const char* urlList[4] = {"unused", "--new-tab", "--search",

    const char* urlList[3] = {"unused", "--search",

                              aSearchResult->GetSearchTerm().get()};

    commandLine = ConstructCommandLine(3, (char**)urlList, nullptr, &tmp);

    commandLine = ConstructCommandLine(std::size(urlList), (char**)urlList,

                                       nullptr, &tmp);

  } else {

    int keyIndex = atoi(aResultID);

    nsCOMPtr<nsINavHistoryResultNode> child;
@@ -373,7 +374,8 @@ static void ActivateResultID( 
    }



    const char* urlList[2] = {"unused", uri.get()};

    commandLine = ConstructCommandLine(2, (char**)urlList, nullptr, &tmp);

    commandLine = ConstructCommandLine(std::size(urlList), (char**)urlList,

                                       nullptr, &tmp);

  }



  if (commandLine) {