Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
system_security
Commits
eb44d814
Commit
eb44d814
authored
8 years ago
by
Chad Brubaker
Committed by
android-build-merger
8 years ago
Browse files
Options
Download
Plain Diff
Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am:
e260a43a
am:
0b7e6492
Change-Id: I48cc0cd45799c1dbdf05dac41a058f4196eb6d47
parents
26457f43
0b7e6492
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
keystore/IKeystoreService.cpp
keystore/IKeystoreService.cpp
+1
-1
No files found.
keystore/IKeystoreService.cpp
View file @
eb44d814
...
...
@@ -235,7 +235,7 @@ static bool readKeymasterBlob(const Parcel& in, keymaster_blob_t* blob) {
return
false
;
}
blob
->
data
=
reinterpret
_cast
<
const
uint8_t
*>
(
malloc
(
length
));
blob
->
data
=
static
_cast
<
const
uint8_t
*>
(
malloc
(
length
));
if
(
!
blob
->
data
)
return
false
;
...
...
This diff is collapsed.
Click to expand it.
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