projects
/
profile
/
ivi
/
speech-recognition.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
752ac81
)
resctl: fix a dereference-before-NULL-check.
author
Krisztian Litkey
<krisztian.litkey@intel.com>
Thu, 6 Nov 2014 14:10:54 +0000
(16:10 +0200)
committer
Krisztian Litkey
<krisztian.litkey@intel.com>
Thu, 6 Nov 2014 14:10:54 +0000
(16:10 +0200)
src/daemon/resctl.c
patch
|
blob
|
history
diff --git
a/src/daemon/resctl.c
b/src/daemon/resctl.c
index
9d0ac4c
..
3d58b13
100644
(file)
--- a/
src/daemon/resctl.c
+++ b/
src/daemon/resctl.c
@@
-287,8
+287,7
@@
void srs_resctl_destroy(srs_resset_t *set)
int srs_resctl_online(srs_context_t *srs, srs_resset_t *set)
{
int srs_resctl_online(srs_context_t *srs, srs_resset_t *set)
{
- srs_resctx_t *ctx = srs->rctx;
- int shared = set->shared;
+ srs_resctx_t *ctx = srs->rctx;
if (set == NULL)
return FALSE;
if (set == NULL)
return FALSE;
@@
-308,8
+307,8
@@
int srs_resctl_online(srs_context_t *srs, srs_resset_t *set)
if (name_srec == NULL || name_ssyn == NULL)
get_resource_names(srs->settings);
if (name_srec == NULL || name_ssyn == NULL)
get_resource_names(srs->settings);
- if (mrp_res_create_resource(set->set, name_srec, TRUE, shared) &&
- mrp_res_create_resource(set->set, name_ssyn, TRUE, shared))
+ if (mrp_res_create_resource(set->set, name_srec, TRUE, s
et->s
hared) &&
+ mrp_res_create_resource(set->set, name_ssyn, TRUE, s
et->s
hared))
return TRUE;
mrp_res_delete_resource_set(set->set);
return TRUE;
mrp_res_delete_resource_set(set->set);