Issue 5568 - Improve string handling by splitting read strings into only ASCII and non-ASCII strings

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 46 matching lines @@
 
         const JsContext context(*jsEngine);
         auto result = jsEngine->NewObject();
         result.SetStringBufferProperty("content", std::move(content));
         if (!error.empty())
           result.SetProperty("error", error);
         jsEngine->TakeJsValues(weakCallback)[0].Call(result);
       });
   }
 
-  inline bool CReturnOrLineFeed(char c)

[hub, 2017/08/30 21:13:31]

nit': I would name this function "IsEndOfLine()"

[sergei, 2017/08/31 10:45:26]

I am actually also not glad with the name of this function. I will definitely
add "Is" prefix.
What about IsLineTerminator and SkipLineTerminators and AdvanceToLineTerminator?

[hub, 2017/08/31 12:59:43]

"End of line" or EOL is often used through the UNIX man pages. "Line break" can
be used in the same context but I have seen it more for word processor. "Line
Terminator" I haven't seen that. Hence my choice of words.

[sergei, 2017/08/31 13:21:44]

agree.

+  inline bool IsEndOfLine(char c)
   {
     return c == 10 || c == 13;
   }
 
-  inline StringBuffer::const_iterator SkipCReturnAndLineFeed(StringBuffer::const_iterator ii, StringBuffer::const_iterator end)

[hub, 2017/08/30 21:13:30]

and this one SkipEndOfLine()

-  {
-    while (ii != end && CReturnOrLineFeed(*ii))
+  inline StringBuffer::const_iterator SkipEndOfLine(StringBuffer::const_iterator ii, StringBuffer::const_iterator end)
+  {
+    while (ii != end && IsEndOfLine(*ii))
       ++ii;
     return ii;
   }
 
-  inline StringBuffer::const_iterator AdvanceUntilCReturnOrLineFeed(StringBuffer::const_iterator ii, StringBuffer::const_iterator end)

[hub, 2017/08/30 21:13:31]

And this one AdvanceToEndOfLine()

But this is not really blocking. I find it clearer.

-  {
-    while (ii != end && !CReturnOrLineFeed(*ii))
+  inline StringBuffer::const_iterator AdvanceToEndOfLine(StringBuffer::const_iterator ii, StringBuffer::const_iterator end)
+  {
+    while (ii != end && !IsEndOfLine(*ii))
       ++ii;
     return ii;
   }
 
   void ReadFromFileCallback(const v8::FunctionCallbackInfo<v8::Value>& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
@@ skipping 28 matching lines @@
 
       auto processFunc = jsValues[0].UnwrapValue().As<v8::Function>();
 
       auto globalContext = context.GetV8Context()->Global();
       if (!globalContext->IsObject())
         throw std::runtime_error("`this` pointer has to be an object");
 
       const v8::TryCatch tryCatch;
 
       const auto contentEnd = content.cend();
-      auto stringBegin = SkipCReturnAndLineFeed(content.begin(), contentEnd);
+      auto stringBegin = SkipEndOfLine(content.begin(), contentEnd);
       do
       {
-        auto stringEnd = AdvanceUntilCReturnOrLineFeed(stringBegin, contentEnd);
+        auto stringEnd = AdvanceToEndOfLine(stringBegin, contentEnd);
         auto jsLine = Utils::StringBufferToV8String(jsEngine->GetIsolate(), StringBuffer(stringBegin, stringEnd)).As<v8::Value>();
         processFunc->Call(globalContext, 1, &jsLine);
         if (tryCatch.HasCaught())
         {
           jsValues[1].Call(jsEngine->NewValue(JsError::ExceptionToString(tryCatch.Exception(), tryCatch.Message())));
           return;
         }
-        stringBegin = SkipCReturnAndLineFeed(stringEnd, contentEnd);
+        stringBegin = SkipEndOfLine(stringEnd, contentEnd);
       } while (stringBegin != contentEnd);
       jsValues[1].Call();
     });
   }
 
   void WriteCallback(const v8::FunctionCallbackInfo<v8::Value>& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
@@ skipping 127 matching lines @@
 JsValue& FileSystemJsObject::Setup(JsEngine& jsEngine, JsValue& obj)
 {
   obj.SetProperty("read", jsEngine.NewCallback(::ReadCallback));
   obj.SetProperty("readFromFile", jsEngine.NewCallback(::ReadFromFileCallback));
   obj.SetProperty("write", jsEngine.NewCallback(::WriteCallback));
   obj.SetProperty("move", jsEngine.NewCallback(::MoveCallback));
   obj.SetProperty("remove", jsEngine.NewCallback(::RemoveCallback));
   obj.SetProperty("stat", jsEngine.NewCallback(::StatCallback));
   return obj;
 }