Bump clang-format to 1.8 to address CVE in async (#63)

* Bump clang-format to 1.8 to address CVE in async * Change files
microsoft · May 11, 2022 · b8bcfa4 · b8bcfa4
1 parent b0adab9
commit b8bcfa4
Show file tree

Hide file tree

Showing 22 changed files with 271 additions and 234 deletions.
diff --git a/change/@microsoft-mso-28c1076c-5201-4e9c-b35f-840a49c0a33f.json b/change/@microsoft-mso-28c1076c-5201-4e9c-b35f-840a49c0a33f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Bump clang-format to 1.8 to address CVE in async",
+  "packageName": "@microsoft/mso",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/libs/compilerAdapters/include/compilerAdapters/linker.h b/libs/compilerAdapters/include/compilerAdapters/linker.h
@@ -15,8 +15,10 @@
   be included. Then, add the corresponding MSO_LINK_SYMBOL macro to one of the
   source files that gets compiled directly into your binary (as an *.obj file)
 */
-#define MSO_DEFINE_SYMBOL(symbol) \
-  extern "C" void __cdecl symbol() {}
+#define MSO_DEFINE_SYMBOL(symbol)  \
+  extern "C" void __cdecl symbol() \
+  {                                \
+  }
 
 // MSO_LINK_INCLUDE and MSO_LINK_SYMBOL macros are only needed for MSVC.
 #if MS_TARGET_WINDOWS

diff --git a/libs/cppExtensions/include/cppExtensions/stringLiteral.h b/libs/cppExtensions/include/cppExtensions/stringLiteral.h
@@ -33,7 +33,7 @@ template <typename char_type>
 class StringLiteral
 {
 public:
-  constexpr operator _Null_terminated_ const char_type *() const noexcept
+  constexpr operator _Null_terminated_ const char_type*() const noexcept
   {
     return m_string;
   }

diff --git a/libs/eventWaitHandle/src/eventWaitHandleImpl_posix.cpp b/libs/eventWaitHandle/src/eventWaitHandleImpl_posix.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-//#include "precomp.h"
+// #include "precomp.h"
 #include "eventWaitHandleImpl.h"
 #include <pthread.h>
 

diff --git a/libs/eventWaitHandle/src/eventWaitHandleImpl_win.cpp b/libs/eventWaitHandle/src/eventWaitHandleImpl_win.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-//#include "precomp.h"
+// #include "precomp.h"
 #include "EventWaitHandleImpl.h"
 #include <synchapi.h>
 #include <algorithm>

diff --git a/libs/future/include/future/details/ifuture.h b/libs/future/include/future/details/ifuture.h
@@ -75,7 +75,7 @@ struct IFuture : IUnknown
   virtual void AddContinuation(Mso::CntPtr<IFuture>&& continuation) noexcept = 0;
 
   _Success_(
-      return ) virtual bool TryStartSetValue(_Out_ ByteArrayView& valueBuffer, bool crashIfFailed = false) noexcept = 0;
+      return) virtual bool TryStartSetValue(_Out_ ByteArrayView& valueBuffer, bool crashIfFailed = false) noexcept = 0;
   virtual void Post() noexcept = 0;
   virtual void StartAwaiting() noexcept = 0;
   virtual bool TrySetSuccess(bool crashIfFailed = false) noexcept = 0;

diff --git a/libs/future/include/future/details/resultTraits.h b/libs/future/include/future/details/resultTraits.h
@@ -84,8 +84,8 @@ struct GetResultTraits<TFutureValue, TExecutor, TCallback, CallbackArgKind::Mayb
 {
   using Type = ResultTraits<
       TFutureValue,
-      decltype(
-          std::declval<TExecutor>().Invoke(std::declval<TCallback>(), std::declval<Mso::Maybe<TFutureValue>&&>()))>;
+      decltype(std::declval<TExecutor>()
+                   .Invoke(std::declval<TCallback>(), std::declval<Mso::Maybe<TFutureValue>&&>()))>;
   static_assert(
       noexcept(std::declval<TExecutor>().Invoke(std::declval<TCallback>(), std::declval<Mso::Maybe<TFutureValue>&&>())),
       "Executor's Invoke method must not throw");

diff --git a/libs/future/src/futureImpl.h b/libs/future/src/futureImpl.h
@@ -230,7 +230,7 @@ class FutureImpl final : public Mso::QueryCastList<Mso::QueryCastDerived<FutureI
   void AddContinuation(Mso::CntPtr<IFuture>&& continuation) noexcept override;
 
   _Success_(
-      return ) bool TryStartSetValue(_Out_ ByteArrayView& valueBuffer, bool crashIfFailed = false) noexcept override;
+      return) bool TryStartSetValue(_Out_ ByteArrayView& valueBuffer, bool crashIfFailed = false) noexcept override;
   void Post() noexcept override;
   void StartAwaiting() noexcept override;
   bool TrySetSuccess(bool crashIfFailed = false) noexcept override;

diff --git a/libs/guid/include/guid/msoGuidDetails.h b/libs/guid/include/guid/msoGuidDetails.h
@@ -16,7 +16,7 @@ See the msoGuid.h for the usage guidelines.
 #endif
 
 // Clang compiler must target C++11 or up to support MSO*GUIDs because we rely on constexpr.
-//#if (__cplusplus >= 201103L) && !defined(MSO_GUID_DISABLED)
+// #if (__cplusplus >= 201103L) && !defined(MSO_GUID_DISABLED)
 
 #include <compilerAdapters/compilerFeatures.h>
 #include <compilerAdapters/compilerWarnings.h>

diff --git a/libs/memoryApi/include/memoryApi/memoryApi.h b/libs/memoryApi/include/memoryApi/memoryApi.h
@@ -83,7 +83,7 @@ enum Enum : unsigned int
   // track this memory using memory marking / idle time leak detection
   MarkingLeak = 0x0004,
 };
-}
+} // namespace AllocFlags
 
 /**
 Return a new allocation of the requested size (cb)

diff --git a/libs/motifCpp/include/motifCpp/testInfo.h b/libs/motifCpp/include/motifCpp/testInfo.h
@@ -9,33 +9,39 @@
 #include <vector>
 #include "motifCpp/motifCppTestBase.h"
 
-#define TEST_CLASS(className)                                                                      \
-  struct className;                                                                                \
-                                                                                                   \
-  struct TestClassInfo_##className final                                                           \
-      : Mso::UnitTests::Internal::TestClassInfoReg<TestClassInfo_##className, className>           \
-  {                                                                                                \
-    TestClassInfo_##className() noexcept : TestClassInfoRegType{#className, __FILE__, __LINE__} {} \
-  };                                                                                               \
-                                                                                                   \
+#define TEST_CLASS(className)                                                                   \
+  struct className;                                                                             \
+                                                                                                \
+  struct TestClassInfo_##className final                                                        \
+      : Mso::UnitTests::Internal::TestClassInfoReg<TestClassInfo_##className, className>        \
+  {                                                                                             \
+    TestClassInfo_##className() noexcept : TestClassInfoRegType{#className, __FILE__, __LINE__} \
+    {                                                                                           \
+    }                                                                                           \
+  };                                                                                            \
+                                                                                                \
   struct className : Mso::UnitTests::Internal::TestClassBase<className, TestClassInfo_##className>
 
-#define TEST_CLASS_EX(className, baseClass)                                                                     \
-  struct className;                                                                                             \
-                                                                                                                \
-  struct TestClassInfo_##className final                                                                        \
-      : baseClass                                                                                               \
-      , Mso::UnitTests::Internal::TestClassInfoReg<TestClassInfo_##className, className>                        \
-  {                                                                                                             \
-    TestClassInfo_##className() noexcept : baseClass{}, TestClassInfoRegType{#className, __FILE__, __LINE__} {} \
-  };                                                                                                            \
-                                                                                                                \
+#define TEST_CLASS_EX(className, baseClass)                                                                  \
+  struct className;                                                                                          \
+                                                                                                             \
+  struct TestClassInfo_##className final                                                                     \
+      : baseClass                                                                                            \
+      , Mso::UnitTests::Internal::TestClassInfoReg<TestClassInfo_##className, className>                     \
+  {                                                                                                          \
+    TestClassInfo_##className() noexcept : baseClass{}, TestClassInfoRegType{#className, __FILE__, __LINE__} \
+    {                                                                                                        \
+    }                                                                                                        \
+  };                                                                                                         \
+                                                                                                             \
   struct className : Mso::UnitTests::Internal::TestClassBase<className, TestClassInfo_##className>
 
 #define TEST_METHOD(methodName)                                                                                       \
   struct TestMethodInfo_##methodName final : Mso::UnitTests::Internal::TestMethodInfoReg<TestMethodInfo_##methodName> \
   {                                                                                                                   \
-    TestMethodInfo_##methodName() : TestMethodInfoRegType{TestClassInfoType::Instance, #methodName, __LINE__} {}      \
+    TestMethodInfo_##methodName() : TestMethodInfoRegType{TestClassInfoType::Instance, #methodName, __LINE__}         \
+    {                                                                                                                 \
+    }                                                                                                                 \
                                                                                                                       \
     void Invoke(Mso::UnitTests::TestClass& test) const override                                                       \
     {                                                                                                                 \

diff --git a/libs/motifCpp/tests/motifCppTest.cpp b/libs/motifCpp/tests/motifCppTest.cpp
@@ -5,7 +5,7 @@
 #include "motifCpp/testCheck.h"
 
 // Uncomment to see errors
-//#define MOTIF_TEST_SHOW_ERRORS
+// #define MOTIF_TEST_SHOW_ERRORS
 
 TEST_CLASS (MotifCppTest)
 {