]> granicus.if.org Git - llvm/commitdiff
[Support] Avoid UB in sys::fs::perms::operator~. NFC.
authorAhmed Bougacha <ahmed.bougacha@gmail.com>
Wed, 26 Apr 2017 00:48:28 +0000 (00:48 +0000)
committerAhmed Bougacha <ahmed.bougacha@gmail.com>
Wed, 26 Apr 2017 00:48:28 +0000 (00:48 +0000)
This was exposed in r297945 and r301220: the intermediate complement
is a 32-bit value, and casting it to 'perms' invokes UB.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301373 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Support/FileSystem.h

index 29515c231bc46f989de37a7a1bdece459c12acb8..e3c5de7fbe642c2ffb29613aff99e0f56827718d 100644 (file)
@@ -116,7 +116,9 @@ inline perms &operator&=(perms &l, perms r) {
   return l;
 }
 inline perms operator~(perms x) {
-  return static_cast<perms>(~static_cast<unsigned short>(x));
+  // Avoid UB by explicitly truncating the (unsigned) ~ result.
+  return static_cast<perms>(
+      static_cast<unsigned short>(~static_cast<unsigned short>(x)));
 }
 
 class UniqueID {