Issue 1397 - FilterEngine::ForceUpdateCheck crashes when passed a 0 std::function

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 76 matching lines @@
       appInfo.name = "test";
       appInfo.version = "1.0.1";
       AdblockPlus::JsEnginePtr jsEngine = CreateJsEngine(appInfo);
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
       mockWebRequest = new MockWebRequest;
       jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(mockWebRequest));
       filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
     }
   };
 
-  struct MockUpdateAvailableCallback
-  {
-    MockUpdateAvailableCallback(int& timesCalled) : timesCalled(timesCalled) {}
-
-    void operator()(const std::string&)
-    {
-      timesCalled++;
-    }
-
-  private:
-    // We currently cannot store timesCalled in the functor, see:
-    // https://issues.adblockplus.org/ticket/1378.
-    int& timesCalled;
-  };
-
-  // Workaround for https://issues.adblockplus.org/ticket/1397.
-  void NoOpUpdaterCallback(const std::string&) {}
-
   class FilterEngineWithFreshFolder : public ::testing::Test
   {
   protected:
     FileSystemPtr fileSystem;
     std::weak_ptr<JsEngine> weakJsEngine;
 
     void SetUp() override
     {
       fileSystem.reset(new DefaultFileSystem());
       // Since there is neither in memory FS nor functionality to work with
@@ skipping 384 matching lines @@
   mockWebRequest->response.responseStatus = 200;
   mockWebRequest->response.responseText = "\
 {\
   \"test\": {\
     \"version\": \"1.0.2\",\
     \"url\": \"https://downloads.adblockplus.org/test-1.0.2.tar.gz?update\"\
   }\
 }";
 
   int timesCalled = 0;
-  MockUpdateAvailableCallback mockUpdateAvailableCallback(timesCalled);
-
-  filterEngine->SetUpdateAvailableCallback(mockUpdateAvailableCallback);
-  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
+  filterEngine->SetUpdateAvailableCallback([&timesCalled](const std::string&)->void
+  {
+    ++timesCalled;
+  });
+  filterEngine->ForceUpdateCheck();
   AdblockPlus::Sleep(100);
-  ASSERT_EQ(1, timesCalled);
+  EXPECT_EQ(1, timesCalled);
 
   filterEngine->RemoveUpdateAvailableCallback();
-  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
+  filterEngine->ForceUpdateCheck();
   AdblockPlus::Sleep(100);
-  ASSERT_EQ(1, timesCalled);
+  EXPECT_EQ(1, timesCalled);
+}
+
+TEST_F(UpdaterTest, ForceUpdateCheck)
+{
+  mockWebRequest->response.status = 0;
+  mockWebRequest->response.responseStatus = 200;
+  mockWebRequest->response.responseText = "\
+{\
+  \"test\": {\
+    \"version\": \"1.0.2\",\
+    \"url\": \"https://downloads.adblockplus.org/test-1.0.2.tar.gz?update\"\
+  }\
+}";
+
+  int called = 0; // 0 - not  called; 1 - once, no error; 2 - error
+  filterEngine->ForceUpdateCheck([&called](const std::string& error)->void
+  {
+    called = error.empty() ? 1 : 2;
+  });
+  AdblockPlus::Sleep(100);
+  EXPECT_EQ(1, called);
 }
 
 TEST_F(FilterEngineTest, DocumentWhitelisting)
 {
   filterEngine->GetFilter("@@||example.org^$document")->AddToList();
   filterEngine->GetFilter("@@||example.com^$document,domain=example.de")->AddToList();
 
   ASSERT_TRUE(filterEngine->IsDocumentWhitelisted(
       "http://example.org",
       std::vector<std::string>()));
@@ skipping 326 matching lines @@
           break;
         }
       }
       ASSERT_TRUE(aaSubscription);
       aaSubscription->RemoveFromList();
     }
 
     testSubscriptionState(parameter.expectedAAStatus, otherSubscriptionsNumber);
   }
 }