diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2016-07-15 19:22:34 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2016-07-15 19:22:34 +0000 |
| commit | 88737a5aa5cca893b47206cd048fa781fa3fc4d7 (patch) | |
| tree | 851cbadcee48f73d071d799811e5b05543e8f0cb /clang/test/ARCMT | |
| parent | 7f6484448121dc82f8080b0c95a675a2317ca32c (diff) | |
| download | llvm-88737a5aa5cca893b47206cd048fa781fa3fc4d7.zip llvm-88737a5aa5cca893b47206cd048fa781fa3fc4d7.tar.gz llvm-88737a5aa5cca893b47206cd048fa781fa3fc4d7.tar.bz2 | |
[objcmt] Fix a buffer overflow crash than can occur while modernizing enums.
Note that due to the nature of the crash it requires libgmalloc or asan for it to crash consistently.
rdar://19932927
llvm-svn: 275600
Diffstat (limited to 'clang/test/ARCMT')
| -rw-r--r-- | clang/test/ARCMT/objcmt-ns-enum-crash.m | 14 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-ns-enum-crash.m.result | 14 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-ns-macros.m.result | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/clang/test/ARCMT/objcmt-ns-enum-crash.m b/clang/test/ARCMT/objcmt-ns-enum-crash.m new file mode 100644 index 0000000..7c9c708 --- /dev/null +++ b/clang/test/ARCMT/objcmt-ns-enum-crash.m @@ -0,0 +1,14 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -objcmt-migrate-ns-macros -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11 +// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result + +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type +typedef long NSInteger; + +typedef enum : NSInteger {five} ApplicableEnum; + +typedef unsigned long mytd; + +#define MY_ENUM(name, type, ...) typedef enum : type { __VA_ARGS__ } name##_t +MY_ENUM(MyEnum, unsigned int, One); diff --git a/clang/test/ARCMT/objcmt-ns-enum-crash.m.result b/clang/test/ARCMT/objcmt-ns-enum-crash.m.result new file mode 100644 index 0000000..0a76e66 --- /dev/null +++ b/clang/test/ARCMT/objcmt-ns-enum-crash.m.result @@ -0,0 +1,14 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -objcmt-migrate-ns-macros -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11 +// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result + +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type +typedef long NSInteger; + +typedef NS_ENUM(NSInteger, ApplicableEnum) {five}; + +typedef unsigned long mytd; + +#define MY_ENUM(name, type, ...) typedef enum : type { __VA_ARGS__ } name##_t +MY_ENUM(MyEnum, unsigned int, One); diff --git a/clang/test/ARCMT/objcmt-ns-macros.m.result b/clang/test/ARCMT/objcmt-ns-macros.m.result index c4c4030..0107827 100644 --- a/clang/test/ARCMT/objcmt-ns-macros.m.result +++ b/clang/test/ARCMT/objcmt-ns-macros.m.result @@ -77,7 +77,7 @@ typedef NS_ENUM(NSInteger, UIK) { UIKTwo = 2, }; -typedef NS_ENUM(unsigned int, NSTickMarkPosition) { +typedef NS_ENUM(unsigned int, NSTickMarkPosition) { NSTickMarkBelow = 0, NSTickMarkAbove = 1, NSTickMarkLeft = NSTickMarkAbove, |