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 | 2527e4ee8fa744bcba4c3d3c914b2b5086fb4807 (patch) | |
| tree | f82ec113c505087f90d1dd208291e12088eed928 /test/ARCMT | |
| parent | 753944f52184ddf75318b5d3f1fd6a7a84587f60 (diff) | |
[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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@275600 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ARCMT')
| -rw-r--r-- | test/ARCMT/objcmt-ns-enum-crash.m | 14 | ||||
| -rw-r--r-- | test/ARCMT/objcmt-ns-enum-crash.m.result | 14 | ||||
| -rw-r--r-- | test/ARCMT/objcmt-ns-macros.m.result | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/test/ARCMT/objcmt-ns-enum-crash.m b/test/ARCMT/objcmt-ns-enum-crash.m new file mode 100644 index 0000000000..7c9c708efa --- /dev/null +++ b/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/test/ARCMT/objcmt-ns-enum-crash.m.result b/test/ARCMT/objcmt-ns-enum-crash.m.result new file mode 100644 index 0000000000..0a76e66ea2 --- /dev/null +++ b/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/test/ARCMT/objcmt-ns-macros.m.result b/test/ARCMT/objcmt-ns-macros.m.result index c4c40300ee..0107827767 100644 --- a/test/ARCMT/objcmt-ns-macros.m.result +++ b/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, |