OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef IPC_PARAM_TRAITS_READ_MACROS_H_ | 5 #ifndef IPC_PARAM_TRAITS_READ_MACROS_H_ |
6 #define IPC_PARAM_TRAITS_READ_MACROS_H_ | 6 #define IPC_PARAM_TRAITS_READ_MACROS_H_ |
7 | 7 |
8 // Null out all the macros that need nulling. | 8 // Null out all the macros that need nulling. |
| 9 #include "base/enum_validation.h" |
9 #include "ipc/ipc_message_null_macros.h" | 10 #include "ipc/ipc_message_null_macros.h" |
10 | 11 |
11 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. | 12 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. |
12 #undef IPC_STRUCT_BEGIN | 13 #undef IPC_STRUCT_BEGIN |
13 #undef IPC_STRUCT_BEGIN_WITH_PARENT | 14 #undef IPC_STRUCT_BEGIN_WITH_PARENT |
14 #undef IPC_STRUCT_MEMBER | 15 #undef IPC_STRUCT_MEMBER |
15 #undef IPC_STRUCT_END | 16 #undef IPC_STRUCT_END |
16 #define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ | 17 #define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ |
17 IPC_STRUCT_BEGIN(struct_name) | 18 IPC_STRUCT_BEGIN(struct_name) |
18 #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) | 19 #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) |
(...skipping 13 matching lines...) Expand all Loading... |
32 #define IPC_STRUCT_TRAITS_PARENT(type) ParamTraits<type>::Read(m, iter, p) && | 33 #define IPC_STRUCT_TRAITS_PARENT(type) ParamTraits<type>::Read(m, iter, p) && |
33 #define IPC_STRUCT_TRAITS_END() 1; } | 34 #define IPC_STRUCT_TRAITS_END() 1; } |
34 | 35 |
35 #undef IPC_ENUM_TRAITS | 36 #undef IPC_ENUM_TRAITS |
36 #define IPC_ENUM_TRAITS(enum_name) \ | 37 #define IPC_ENUM_TRAITS(enum_name) \ |
37 bool ParamTraits<enum_name>:: \ | 38 bool ParamTraits<enum_name>:: \ |
38 Read(const Message* m, PickleIterator* iter, param_type* p) { \ | 39 Read(const Message* m, PickleIterator* iter, param_type* p) { \ |
39 int type; \ | 40 int type; \ |
40 if (!m->ReadInt(iter, &type)) \ | 41 if (!m->ReadInt(iter, &type)) \ |
41 return false; \ | 42 return false; \ |
| 43 if (!IsIntValidForEnum<param_type>(type)) \ |
| 44 return false; \ |
42 *p = static_cast<param_type>(type); \ | 45 *p = static_cast<param_type>(type); \ |
43 return true; \ | 46 return true; \ |
44 } | 47 } |
45 | 48 |
46 #endif // IPC_PARAM_TRAITS_READ_MACROS_H_ | 49 #endif // IPC_PARAM_TRAITS_READ_MACROS_H_ |
47 | 50 |
OLD | NEW |