Issue 2005 - Refactor working with strings in InputBuffer and OutputBuffer

src/shared/Communication.h

+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef COMMUNICATION_H
 #define COMMUNICATION_H
 
 #include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
 #include <vector>
 #include <Windows.h>
 #include "Utils.h"
 
 namespace Communication
 {
   extern const std::wstring pipeName;
   extern std::wstring browserSID;
 
   enum ProcType : uint32_t {
     PROC_MATCHES,
     PROC_GET_ELEMHIDE_SELECTORS,
     PROC_AVAILABLE_SUBSCRIPTIONS,
     PROC_LISTED_SUBSCRIPTIONS,
     PROC_SET_SUBSCRIPTION,
     PROC_ADD_SUBSCRIPTION,
     PROC_REMOVE_SUBSCRIPTION,
     PROC_UPDATE_ALL_SUBSCRIPTIONS,
     PROC_GET_EXCEPTION_DOMAINS,
-    PROC_IS_WHITELISTED_URL,
+    PROC_GET_WHITELISTING_FITER,
     PROC_IS_ELEMHIDE_WHITELISTED_ON_URL,
     PROC_ADD_FILTER,
     PROC_REMOVE_FILTER,
     PROC_SET_PREF,
     PROC_GET_PREF,
     PROC_IS_FIRST_RUN_ACTION_NEEDED,
     PROC_CHECK_FOR_UPDATES,
     PROC_GET_DOCUMENTATION_LINK,
     PROC_TOGGLE_PLUGIN_ENABLED,
     PROC_GET_HOST,
@@ skipping 53 matching lines @@
     InputBuffer& ReadString(std::string& value)
     {
       CheckType(TYPE_STRING);
 
       SizeType length;
       ReadBinary(length);
       value.resize(length);
       if (length > 0)
       {
         buffer.read(&value[0], length);
+        if (buffer.fail())
+          throw new std::runtime_error("Unexpected end of input buffer");
       }
-      if (buffer.fail())
-        throw new std::runtime_error("Unexpected end of input buffer");

[Eric, 2015/02/18 18:12:47]

This test for failure should be guarded by the conditional. No sense in testing
the buffer if we didn't do an operation on it.

[sergei, 2015/02/19 17:26:57]

moved

       return *this;
     }
 
     InputBuffer& ReadStrings(std::vector<std::string>& value)
     {
       value.clear();
       CheckType(ValueType::TYPE_STRINGS);
 
       SizeType length;
       ReadBinary(length);
@@ skipping 120 matching lines @@
 
     InputBuffer ReadMessage();
     void WriteMessage(OutputBuffer& message);
 
   protected:
     HANDLE pipe;
   };
 }
 
 #endif