witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

feat(c-wrapper): getCppPtrFromC is more secure, check types

Browse source
This commit is contained in:
Ronan Abhamon 2017-09-26 15:47:52 +02:00
parent 325653641b
commit 20690528fb
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linphone/utils/general.h
View file

@ -74,7 +74,7 @@ void l_assert (const char *condition, const char *file, int line);
// Allows access to private internal data.
// Gives a control to C Wrapper.
#define L_DECLARE_PRIVATE(CLASS) \
inline CLASS ## Private * getPrivate() { \
inline CLASS ## Private *getPrivate() { \
return reinterpret_cast<CLASS ## Private *>(mPrivate); \
} \
inline const CLASS ## Private *getPrivate() const { \

3
src/c-wrapper/c-wrapper.h
View file

@ -41,7 +41,8 @@
F(Participant, Participant)
#define L_REGISTER_SUBTYPES(F) \
F(ChatRoom, ClientGroupChatRoom)
F(ChatRoom, ClientGroupChatRoom) \
F(ChatRoom, RealTimeTextChatRoom)
// =============================================================================
// Register belle-sip ID.

28
src/c-wrapper/internal/c-tools.h
View file

@ -37,11 +37,13 @@ LINPHONE_BEGIN_NAMESPACE
template<typename CppType>
struct CppTypeToCType {
enum { defined = false };
typedef void type;
};
template<typename CType>
struct CTypeToCppType {
enum { defined = false };
typedef void type;
};
template<typename CppType>
@ -51,7 +53,23 @@ class Wrapper {
private:
template<typename CppType>
struct IsCppObject {
enum { value = std::is_base_of<Object, CppType>::value || std::is_base_of<ClonableObject, CppType>::value };
enum {
value = std::is_base_of<Object, CppType>::value || std::is_base_of<ClonableObject, CppType>::value
};
};
template<typename CppType>
struct IsDefinedNotClonableCppObject {
enum {
value = CppTypeToCType<CppType>::defined && std::is_base_of<Object, CppType>::value
};
};
template<typename CppType>
struct IsDefinedClonableCppObject {
enum {
value = CppTypeToCType<CppType>::defined && std::is_base_of<ClonableObject, CppType>::value
};
};
template<typename CType>
@ -86,7 +104,7 @@ public:
template<
typename CType,
typename CppType = typename CTypeToCppType<CType>::type,
typename = typename std::enable_if<std::is_base_of<Object, CppType>::value, CppType>::type
typename = typename std::enable_if<IsDefinedNotClonableCppObject<CppType>::value, CppType>::type
>
static constexpr std::shared_ptr<CppType> getCppPtrFromC (CType *cObject) {
return reinterpret_cast<WrappedObject<CppType> *>(cObject)->cppPtr;
@ -95,7 +113,7 @@ public:
template<
typename CType,
typename CppType = typename CTypeToCppType<CType>::type,
typename = typename std::enable_if<std::is_base_of<Object, CppType>::value, CppType>::type
typename = typename std::enable_if<IsDefinedNotClonableCppObject<CppType>::value, CppType>::type
>
static constexpr std::shared_ptr<const CppType> getCppPtrFromC (const CType *cObject) {
return reinterpret_cast<const WrappedObject<CppType> *>(cObject)->cppPtr;
@ -104,7 +122,7 @@ public:
template<
typename CType,
typename CppType = typename CTypeToCppType<CType>::type,
typename = typename std::enable_if<std::is_base_of<ClonableObject, CppType>::value, CppType>::type
typename = typename std::enable_if<IsDefinedClonableCppObject<CppType>::value, CppType>::type
>
static constexpr CppType *getCppPtrFromC (CType *cObject) {
return reinterpret_cast<WrappedClonableObject<CppType> *>(cObject)->cppPtr;
@ -113,7 +131,7 @@ public:
template<
typename CType,
typename CppType = typename CTypeToCppType<CType>::type,
typename = typename std::enable_if<std::is_base_of<ClonableObject, CppType>::value, CppType>::type
typename = typename std::enable_if<IsDefinedClonableCppObject<CppType>::value, CppType>::type
>
static constexpr const CppType *getCppPtrFromC (const CType *cObject) {
return reinterpret_cast<const WrappedClonableObject<CppType> *>(cObject)->cppPtr;