Cover both cast styles for std::byte pointer scaling

Replace the Record example with two int-pointer cases matching test9, using C-style casts and reinterpret_cast respectively. Regenerate expected results for both existing false positives.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: jketema

cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/IncorrectPointerScaling.expected

@@ -1,4 +1,5 @@
 | test.cpp:50:19:50:19 | p | This pointer might have type $@ (size 8), but this pointer arithmetic is done with type int * (size 4). | test.cpp:45:11:45:11 | test.cpp:45:11:45:11 | double |
 | test.cpp:94:18:94:18 | x | This pointer might have type $@ (size 4), but this pointer arithmetic is done with type short * (size 2). | test.cpp:88:21:88:21 | test.cpp:88:21:88:21 | int |
 | test.cpp:130:27:130:29 | arr | This pointer might have type $@ (size 4), but this pointer arithmetic is done with type short * (size 2). | test.cpp:128:16:128:18 | test.cpp:128:16:128:18 | int |
-| test.cpp:161:36:161:42 | storage | This pointer might have type $@ (size 1), but this pointer arithmetic is done with type Record * (size 4). | test.cpp:158:27:158:33 | test.cpp:158:27:158:33 | byte |
+| test.cpp:160:24:160:24 | p | This pointer might have type $@ (size 1), but this pointer arithmetic is done with type int * (size 4). | test.cpp:155:14:155:14 | test.cpp:155:14:155:14 | byte |
+| test.cpp:169:39:169:39 | p | This pointer might have type $@ (size 1), but this pointer arithmetic is done with type int * (size 4). | test.cpp:164:14:164:14 | test.cpp:164:14:164:14 | byte |

cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/IncorrectPointerScaling/test.cpp

@@ -151,12 +151,20 @@ namespace std {
 enum class byte : unsigned char {};
 }
 
-struct Record {
-  int value;
-};
+std::byte* test19(
+  std::byte *x
+) {
+  int *p = (int*)x;
+  // GOOD [FALSE POSITIVE of IncorrectPointerScaling.ql]: like char*, std::byte*
+  // is a generic pointer type, so assume that it is really an int*.
+  return (std::byte *)(p + 1); // $ Alert[cpp/suspicious-pointer-scaling]
+}
 
-Record* test19(std::byte* storage, unsigned long recordIndex) {
-  // GOOD [FALSE POSITIVE of IncorrectPointerScaling.ql]: this offset is a
-  // record index, not a byte offset.
-  return reinterpret_cast<Record*>(storage) + recordIndex; // $ Alert[cpp/suspicious-pointer-scaling]
+std::byte* test20(
+  std::byte *x
+) {
+  int *p = reinterpret_cast<int*>(x);
+  // GOOD [FALSE POSITIVE of IncorrectPointerScaling.ql]: like char*, std::byte*
+  // is a generic pointer type, so assume that it is really an int*.
+  return reinterpret_cast<std::byte*>(p + 1); // $ Alert[cpp/suspicious-pointer-scaling]
 }