diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2003-12-01 23:29:59 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2003-12-01 23:29:59 +0000 |
| commit | 75d3baee1823eb2211f58f8f3e0e718e4f128f08 (patch) | |
| tree | 13d311306a2e450cead72959b52908f3a1874875 /libobjc/Protocol.m | |
| parent | bb9cfd00626b99a5d7cd770c91093ea27a907f84 (diff) | |
| download | gcc-75d3baee1823eb2211f58f8f3e0e718e4f128f08.zip gcc-75d3baee1823eb2211f58f8f3e0e718e4f128f08.tar.gz gcc-75d3baee1823eb2211f58f8f3e0e718e4f128f08.tar.bz2 | |
re PR libobjc/11433 (Crash due to dereferencing null pointer when querying protocol)
PR 11433
gcc/testsuite:
* objc.dg/proto-lossage-3.m: New test.
libobjc:
* Protocol.m (descriptionForInstanceMethod): Don't dereference
instance_methods if it's NULL.
(descriptionForClassMethod): Likewise for class_methods.
From-SVN: r74137
Diffstat (limited to 'libobjc/Protocol.m')
| -rw-r--r-- | libobjc/Protocol.m | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libobjc/Protocol.m b/libobjc/Protocol.m index 8191dc2..06a25ac 100644 --- a/libobjc/Protocol.m +++ b/libobjc/Protocol.m @@ -80,11 +80,12 @@ struct objc_method_description_list { const char* name = sel_get_name (aSel); struct objc_method_description *result; - for (i = 0; i < instance_methods->count; i++) - { - if (!strcmp ((char*)instance_methods->list[i].name, name)) - return &(instance_methods->list[i]); - } + if (instance_methods) + for (i = 0; i < instance_methods->count; i++) + { + if (!strcmp ((char*)instance_methods->list[i].name, name)) + return &(instance_methods->list[i]); + } for (proto_list = protocol_list; proto_list; proto_list = proto_list->next) { @@ -107,11 +108,12 @@ struct objc_method_description_list { const char* name = sel_get_name (aSel); struct objc_method_description *result; - for (i = 0; i < class_methods->count; i++) - { - if (!strcmp ((char*)class_methods->list[i].name, name)) - return &(class_methods->list[i]); - } + if (class_methods) + for (i = 0; i < class_methods->count; i++) + { + if (!strcmp ((char*)class_methods->list[i].name, name)) + return &(class_methods->list[i]); + } for (proto_list = protocol_list; proto_list; proto_list = proto_list->next) { |