[CodeView] Avoid integer overflow while parsing long version strings

This came up on a funny vendor-provided version string that didn't have
a standard dotted quad of numbers.
This commit is contained in:
Reid Kleckner 2022-02-10 13:40:28 -08:00
parent a18d06a0f8
commit 64037afe01
2 changed files with 38 additions and 1 deletions

View File

@ -826,6 +826,8 @@ static Version parseVersion(StringRef Name) {
if (isdigit(C)) {
V.Part[N] *= 10;
V.Part[N] += C - '0';
V.Part[N] =
std::min<int>(V.Part[N], std::numeric_limits<uint16_t>::max());
} else if (C == '.') {
++N;
if (N >= 4)
@ -867,7 +869,6 @@ void CodeViewDebug::emitCompilerInformation() {
Version FrontVer = parseVersion(CompilerVersion);
OS.AddComment("Frontend version");
for (int N : FrontVer.Part) {
N = std::min<int>(N, std::numeric_limits<uint16_t>::max());
OS.emitInt16(N);
}

View File

@ -0,0 +1,36 @@
; RUN: llc -filetype=obj -mtriple i686-pc-windows-msvc %s -o %t.o
; RUN: llvm-pdbutil dump %t.o -symbols | FileCheck %s
; CHECK: {{.*}} | S_COMPILE3 [size = {{.*}}]
; CHECK-NEXT: machine = intel pentium 3, Ver = clang version 999999999999.9999999999.9999999.99999999 , language = c++
; CHECK-NEXT: frontend = 65535.65535.65535.65535, backend = 15000.0.0.0
; CHECK-NEXT: flags = none
; ModuleID = 'D:\src\scopes\foo.cpp'
source_filename = "D:\5Csrc\5Cscopes\5Cfoo.cpp"
target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
target triple = "i686-pc-windows-msvc19.0.23918"
define i32 @"?foo@@YAHXZ"() !dbg !10 {
entry:
ret i32 42, !dbg !14
}
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!7, !8}
!llvm.ident = !{!9}
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 999999999999.9999999999.9999999.99999999 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
; One .debug$S section should contain an S_COMPILE3 record that identifies the
; source language and the version of the compiler based on the DICompileUnit.
!1 = !DIFile(filename: "D:\5Csrc\5Cscopes\5Cfoo.cpp", directory: "D:\5Csrc\5Cscopes\5Cclang")
!2 = !{}
!7 = !{i32 2, !"CodeView", i32 1}
!8 = !{i32 2, !"Debug Info Version", i32 3}
!9 = !{!"clang version 4.0.0 "}
!10 = distinct !DISubprogram(name: "foo", linkageName: "\01?foo@@YAHXZ", scope: !1, file: !1, line: 1, type: !11, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
!11 = !DISubroutineType(types: !12)
!12 = !{!13}
!13 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
!14 = !DILocation(line: 2, scope: !10)