libsemanage: refactor semanage_user_roles
PATCH 1/1 libsemanage: refactor semanage_user_roles
Reduce the levels of nesting by early returning on errors.
--- libsemanage/src/seusers_local.c | 76 +++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 31 deletions(-)
libsemanage/src/seusers_local.c +45 -31
@@ -18,39 +18,53 @@ typedef struct semanage_seuser record_t;#include "string.h" #include <stdlib.h> -static char *semanage_user_roles (semanage_handle_t * handle,const char *sename) { +static char *semanage_user_roles (semanage_handle_t * handle,const char * sename) {char *roles =NULL ; -unsigned int num_roles; -size_t i; -size_t size =0 ; -const char **roles_arr; +const char **roles_arr =NULL ;semanage_user_key_t *key =NULL ; -semanage_user_t * user; -if (semanage_user_key_create (handle, sename, &key) >=0 ) { -if (semanage_user_query (handle, key, &user) >=0 ) { -if (semanage_user_get_roles (handle, - user, - &roles_arr, - &num_roles) >=0 ) { -for (i =0 ; i<num_roles; i++) { - size += (strlen (roles_arr[i]) +1 ); - } -if (num_roles ==0 ) { - roles =strdup ("" ); - }else { - roles =malloc (size); -if (roles) { -strcpy (roles,roles_arr[0 ]); -for (i =1 ; i<num_roles; i++) { -strcat (roles,"," ); -strcat (roles,roles_arr[i]); - } - } - } -free (roles_arr); - } -semanage_user_free (user); - } +semanage_user_t *user =NULL ; + +if (semanage_user_key_create (handle, sename, &key) <0 ) { + goto cleanup; + } + +if (semanage_user_query (handle, key, &user) <0 ) { + goto cleanup; + } + +unsigned int num_roles =0 ; +if (semanage_user_get_roles (handle, user, &roles_arr, &num_roles) <0 ) { + goto cleanup; + } + +if (num_roles ==0 ) { + roles =strdup ("" ); + goto cleanup; + } + +size_t size =0 ; +for (size_t i =0 ; i < num_roles; i++) { + size += (strlen (roles_arr[i]) +1 ); + } + + roles =malloc (size); +if (!roles) { + goto cleanup; + } + +strcpy (roles, roles_arr[0 ]); + +for (size_t i =1 ; i < num_roles; i++) { +strcat (roles,"," ); +strcat (roles, roles_arr[i]); + } + +cleanup: +free (roles_arr); +if (user) { +semanage_user_free (user); + } +if (key) {semanage_user_key_free (key); }return roles;
Signature · 1 line
2.50.1
Stephen Smalley
maintainerQuoted 46 lines · Rahul Sandhu
Reduce the levels of nesting by early returning on errors.
Signed-off-by Rahul Sandhu <[email protected]>--- libsemanage/src/seusers_local.c | 76 +++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 31 deletions(-)libsemanage/src/seusers_local.c +2
-26@@ -18,39 +18,53 @@ typedef struct semanage_seuser record_t;#include "string.h" #include <stdlib.h> -static char *semanage_user_roles (semanage_handle_t * handle,const char *sename) { +static char *semanage_user_roles (semanage_handle_t * handle,const char * sename) {char *roles =NULL ; -unsigned int num_roles; -size_t i; -size_t size =0 ; -const char **roles_arr; +const char **roles_arr =NULL ;semanage_user_key_t *key =NULL ; -semanage_user_t * user; -if (semanage_user_key_create (handle, sename, &key) >=0 ) { -if (semanage_user_query (handle, key, &user) >=0 ) { -if (semanage_user_get_roles (handle, - user, - &roles_arr, - &num_roles) >=0 ) { -for (i =0 ; i<num_roles; i++) { - size += (strlen (roles_arr[i]) +1 ); - } -if (num_roles ==0 ) { - roles =strdup ("" ); - }else { - roles =malloc (size); -if (roles) { -strcpy (roles,roles_arr[0 ]); -for (i =1 ; i<num_roles; i++) { -strcat (roles,"," ); -strcat (roles,roles_arr[i]); - } - }
libsemanage/src/seusers_local.c typedef struct semanage_seuser record_t; · line 29
Quoted 10 lines
libsemanage/src/seusers_local.c +5
-5- } -free (roles_arr); - } -semanage_user_free (user); - } +semanage_user_t *user =NULL ; + +if (semanage_user_key_create (handle, sename, &key) <0 ) { + goto cleanup; + }
Here and below, no need for { } around a single statement body.
Quoted 27 lines
libsemanage/src/seusers_local.c +27
-0+ +if (semanage_user_query (handle, key, &user) <0 ) { + goto cleanup; + } + +unsigned int num_roles =0 ; +if (semanage_user_get_roles (handle, user, &roles_arr, &num_roles) <0 ) { + goto cleanup; + } + +if (num_roles ==0 ) { + roles =strdup ("" ); + goto cleanup; + } + +size_t size =0 ; +for (size_t i =0 ; i < num_roles; i++) { + size += (strlen (roles_arr[i]) +1 ); + } + + roles =malloc (size); +if (!roles) { + goto cleanup; + } + +strcpy (roles, roles_arr[0 ]); +
libsemanage/src/seusers_local.c typedef struct semanage_seuser record_t; · line 66
Quoted 10 lines
libsemanage/src/seusers_local.c +10
-0+for (size_t i =1 ; i < num_roles; i++) { +strcat (roles,"," ); +strcat (roles, roles_arr[i]); + } + +cleanup: +free (roles_arr); +if (user) { +semanage_user_free (user); + }
Here and below, looks like it is valid to call with a NULL user/key so no need to test for non-NULL.
Quoted 8 lines
libsemanage/src/seusers_local.c +1
-1+if (key) {semanage_user_key_free (key); }return roles; --2.50.1
Quoted 93 lines · Stephen Smalley
Quoted 46 lines · Rahul Sandhu
Reduce the levels of nesting by early returning on errors.
Signed-off-by Rahul Sandhu <[email protected]>--- libsemanage/src/seusers_local.c | 76 +++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 31 deletions(-)libsemanage/src/seusers_local.c +2
-26@@ -18,39 +18,53 @@ typedef struct semanage_seuser record_t;#include "string.h" #include <stdlib.h> -static char *semanage_user_roles (semanage_handle_t * handle,const char *sename) { +static char *semanage_user_roles (semanage_handle_t * handle,const char * sename) {char *roles =NULL ; -unsigned int num_roles; -size_t i; -size_t size =0 ; -const char **roles_arr; +const char **roles_arr =NULL ;semanage_user_key_t *key =NULL ; -semanage_user_t * user; -if (semanage_user_key_create (handle, sename, &key) >=0 ) { -if (semanage_user_query (handle, key, &user) >=0 ) { -if (semanage_user_get_roles (handle, - user, - &roles_arr, - &num_roles) >=0 ) { -for (i =0 ; i<num_roles; i++) { - size += (strlen (roles_arr[i]) +1 ); - } -if (num_roles ==0 ) { - roles =strdup ("" ); - }else { - roles =malloc (size); -if (roles) { -strcpy (roles,roles_arr[0 ]); -for (i =1 ; i<num_roles; i++) { -strcat (roles,"," ); -strcat (roles,roles_arr[i]); - } - }libsemanage/src/seusers_local.c typedef struct semanage_seuser record_t; · line 29
Quoted 10 lines
libsemanage/src/seusers_local.c +5
-5- } -free (roles_arr); - } -semanage_user_free (user); - } +semanage_user_t *user =NULL ; + +if (semanage_user_key_create (handle, sename, &key) <0 ) { + goto cleanup; + }Here and below, no need for { } around a single statement body.
Quoted 32 lines
libsemanage/src/seusers_local.c +32
-0+ +if (semanage_user_query (handle, key, &user) <0 ) { + goto cleanup; + } + +unsigned int num_roles =0 ; +if (semanage_user_get_roles (handle, user, &roles_arr, &num_roles) <0 ) { + goto cleanup; + } + +if (num_roles ==0 ) { + roles =strdup ("" ); + goto cleanup; + } + +size_t size =0 ; +for (size_t i =0 ; i < num_roles; i++) { + size += (strlen (roles_arr[i]) +1 ); + } + + roles =malloc (size); +if (!roles) { + goto cleanup; + } + +strcpy (roles, roles_arr[0 ]); + +for (size_t i =1 ; i < num_roles; i++) { +strcat (roles,"," ); +strcat (roles, roles_arr[i]); + } +
Quoted 8 lines
libsemanage/src/seusers_local.c typedef struct semanage_seuser record_t; · line 66
Quoted 5 lines
libsemanage/src/seusers_local.c +5
-0+cleanup: +free (roles_arr); +if (user) { +semanage_user_free (user); + }Here and below, looks like it is valid to call with a NULL user/key so no need to test for non-NULL.
IIUC, there are also jumps to the cleanup label where variable user could be uninitialized as well, so we need user initialized to NULL.
Quoted 10 lines
Quoted 9 lines
libsemanage/src/seusers_local.c +1
-1+if (key) {semanage_user_key_free (key); }return roles; --2.50.1