replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[C API] Prevent nullptr dereferences in C API for counting attributes. 

See https://reviews.llvm.org/D26392

Patch by @maleadt

llvm-svn: 287044
This commit is contained in:
Amaury Sechet 2016-11-15 22:19:59 +00:00
parent f5f37ee546
commit 003216b319
6 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/test/Bindings/llvm-c/callsite_attributes.ll Normal file
View File

@ -0,0 +1,12 @@
; RUN: llvm-as %s -o %t.bc
; RUN: llvm-c-test --test-callsite-attributes < %t.bc
; This used to segfault
define void @Y() {
ret void
}
define void @X() {
call void @X()
ret void
}

7
llvm/test/Bindings/llvm-c/function_attributes.ll Normal file
View File

@ -0,0 +1,7 @@
; RUN: llvm-as %s -o %t.bc
; RUN: llvm-c-test --test-function-attributes < %t.bc
; This used to segfault
define void @X() {
ret void
}

1
llvm/tools/llvm-c-test/CMakeLists.txt
View File

@ -36,6 +36,7 @@ if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
endif ()
add_llvm_tool(llvm-c-test
attributes.c
calc.c
diagnostic.c
disassemble.c

75
llvm/tools/llvm-c-test/attributes.c Normal file
View File

@ -0,0 +1,75 @@
/*===-- attributes.c - tool for testing libLLVM and llvm-c API ------------===*\
|* *|
|* The LLVM Compiler Infrastructure *|
|* *|
|* This file is distributed under the University of Illinois Open Source *|
|* License. See LICENSE.TXT for details. *|
|* *|
|*===----------------------------------------------------------------------===*|
|* *|
|* This file implements the --test-attributes and --test-callsite-attributes *|
|* commands in llvm-c-test. *|
|* *|
\*===----------------------------------------------------------------------===*/
#include "llvm-c-test.h"
#include <stdlib.h>
int llvm_test_function_attributes(void) {
LLVMEnablePrettyStackTrace();
LLVMModuleRef M = llvm_load_module(false, true);
LLVMValueRef F = LLVMGetFirstFunction(M);
while (F) {
// Read attributes
for (int Idx = LLVMAttributeFunctionIndex, ParamCount = LLVMCountParams(F);
Idx <= ParamCount; ++Idx) {
int AttrCount = LLVMGetAttributeCountAtIndex(F, Idx);
LLVMAttributeRef *Attrs =
(LLVMAttributeRef *)malloc(AttrCount * sizeof(LLVMAttributeRef));
LLVMGetAttributesAtIndex(F, Idx, Attrs);
free(Attrs);
}
F = LLVMGetNextFunction(F);
}
LLVMDisposeModule(M);
return 0;
}
int llvm_test_callsite_attributes(void) {
LLVMEnablePrettyStackTrace();
LLVMModuleRef M = llvm_load_module(false, true);
LLVMValueRef F = LLVMGetFirstFunction(M);
while (F) {
LLVMBasicBlockRef BB;
for (BB = LLVMGetFirstBasicBlock(F); BB; BB = LLVMGetNextBasicBlock(BB)) {
LLVMValueRef I;
for (I = LLVMGetFirstInstruction(BB); I; I = LLVMGetNextInstruction(I)) {
if (LLVMIsACallInst(I)) {
// Read attributes
for (int Idx = LLVMAttributeFunctionIndex,
ParamCount = LLVMCountParams(F);
Idx <= ParamCount; ++Idx) {
int AttrCount = LLVMGetCallSiteAttributeCount(I, Idx);
LLVMAttributeRef *Attrs = (LLVMAttributeRef *)malloc(
AttrCount * sizeof(LLVMAttributeRef));
LLVMGetCallSiteAttributes(I, Idx, Attrs);
free(Attrs);
}
}
}
}
F = LLVMGetNextFunction(F);
}
LLVMDisposeModule(M);
return 0;
}

4
llvm/tools/llvm-c-test/llvm-c-test.h
View File

@ -52,6 +52,10 @@ int llvm_echo(void);
// diagnostic.c
int llvm_test_diagnostic_handler(void);
// attributes.c
int llvm_test_function_attributes();
int llvm_test_callsite_attributes();
#ifdef __cplusplus
}
#endif /* !defined(__cplusplus) */

4
llvm/tools/llvm-c-test/main.c
View File

@ -88,6 +88,10 @@ int main(int argc, char **argv) {
return llvm_add_named_metadata_operand();
} else if (argc == 2 && !strcmp(argv[1], "--set-metadata")) {
return llvm_set_metadata();
} else if (argc == 2 && !strcmp(argv[1], "--test-function-attributes")) {
return llvm_test_function_attributes();
} else if (argc == 2 && !strcmp(argv[1], "--test-callsite-attributes")) {
return llvm_test_callsite_attributes();
} else if (argc == 2 && !strcmp(argv[1], "--echo")) {
return llvm_echo();
} else if (argc == 2 && !strcmp(argv[1], "--test-diagnostic-handler")) {