Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
cc9a97f0
Commit
cc9a97f0
authored
Oct 17, 2018
by
manuroe
Browse files
OLMKit: Zero buffers out in all pickle & unpickle methods
parent
90bbdec8
Changes
4
Hide whitespace changes
Inline
Side-by-side
xcode/OLMKit/OLMAccount.m
View file @
cc9a97f0
...
...
@@ -193,6 +193,7 @@
}
NSMutableData
*
pickle
=
[
serializedData
dataUsingEncoding
:
NSUTF8StringEncoding
].
mutableCopy
;
size_t
result
=
olm_unpickle_account
(
_account
,
key
.
bytes
,
key
.
length
,
pickle
.
mutableBytes
,
pickle
.
length
);
[
pickle
resetBytesInRange
:
NSMakeRange
(
0
,
pickle
.
length
)];
if
(
result
==
olm_error
())
{
const
char
*
olm_error
=
olm_account_last_error
(
_account
);
NSString
*
errorString
=
[
NSString
stringWithUTF8String
:
olm_error
];
...
...
@@ -219,6 +220,7 @@
return
nil
;
}
NSString
*
pickleString
=
[[
NSString
alloc
]
initWithData
:
pickled
encoding
:
NSUTF8StringEncoding
];
[
pickled
resetBytesInRange
:
NSMakeRange
(
0
,
pickled
.
length
)];
return
pickleString
;
}
...
...
xcode/OLMKit/OLMInboundGroupSession.m
View file @
cc9a97f0
...
...
@@ -227,6 +227,7 @@
}
NSMutableData
*
pickle
=
[
serializedData
dataUsingEncoding
:
NSUTF8StringEncoding
].
mutableCopy
;
size_t
result
=
olm_unpickle_inbound_group_session
(
session
,
key
.
bytes
,
key
.
length
,
pickle
.
mutableBytes
,
pickle
.
length
);
[
pickle
resetBytesInRange
:
NSMakeRange
(
0
,
pickle
.
length
)];
if
(
result
==
olm_error
())
{
const
char
*
olm_error
=
olm_inbound_group_session_last_error
(
session
);
NSString
*
errorString
=
[
NSString
stringWithUTF8String
:
olm_error
];
...
...
@@ -253,6 +254,7 @@
return
nil
;
}
NSString
*
pickleString
=
[[
NSString
alloc
]
initWithData
:
pickled
encoding
:
NSUTF8StringEncoding
];
[
pickled
resetBytesInRange
:
NSMakeRange
(
0
,
pickled
.
length
)];
return
pickleString
;
}
...
...
xcode/OLMKit/OLMOutboundGroupSession.m
View file @
cc9a97f0
...
...
@@ -148,6 +148,7 @@
}
NSMutableData
*
pickle
=
[
serializedData
dataUsingEncoding
:
NSUTF8StringEncoding
].
mutableCopy
;
size_t
result
=
olm_unpickle_outbound_group_session
(
session
,
key
.
bytes
,
key
.
length
,
pickle
.
mutableBytes
,
pickle
.
length
);
[
pickle
resetBytesInRange
:
NSMakeRange
(
0
,
pickle
.
length
)];
if
(
result
==
olm_error
())
{
const
char
*
olm_error
=
olm_outbound_group_session_last_error
(
session
);
NSString
*
errorString
=
[
NSString
stringWithUTF8String
:
olm_error
];
...
...
@@ -174,6 +175,7 @@
return
nil
;
}
NSString
*
pickleString
=
[[
NSString
alloc
]
initWithData
:
pickled
encoding
:
NSUTF8StringEncoding
];
[
pickled
resetBytesInRange
:
NSMakeRange
(
0
,
pickled
.
length
)];
return
pickleString
;
}
...
...
xcode/OLMKit/OLMSession.m
View file @
cc9a97f0
...
...
@@ -309,6 +309,7 @@
}
NSMutableData
*
pickle
=
[
serializedData
dataUsingEncoding
:
NSUTF8StringEncoding
].
mutableCopy
;
size_t
result
=
olm_unpickle_session
(
_session
,
key
.
bytes
,
key
.
length
,
pickle
.
mutableBytes
,
pickle
.
length
);
[
pickle
resetBytesInRange
:
NSMakeRange
(
0
,
pickle
.
length
)];
if
(
result
==
olm_error
())
{
const
char
*
olm_error
=
olm_session_last_error
(
_session
);
NSString
*
errorString
=
[
NSString
stringWithUTF8String
:
olm_error
];
...
...
@@ -335,6 +336,7 @@
return
nil
;
}
NSString
*
pickleString
=
[[
NSString
alloc
]
initWithData
:
pickled
encoding
:
NSUTF8StringEncoding
];
[
pickled
resetBytesInRange
:
NSMakeRange
(
0
,
pickled
.
length
)];
return
pickleString
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment