R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed potential segfault

Browse Source
This commit is contained in:
Craig Williams
2020-10-07 15:07:10 +01:00
parent fb5bcf8967
commit 19cac8d09f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/modb_accounting.c
View File

@@ -17,7 +17,7 @@ int modbUserById(stored_conn *sconn, modb_ref *modb, unsigned int id, int with_g
res = doScalarUsersQuery(sconn, modb, wb, user); res = doScalarUsersQuery(sconn, modb, wb, user);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_groups) { if (res > 0 && with_groups) {
if (modbFetchUserGroups( if (modbFetchUserGroups(
sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups
) < 0) { ) < 0) {
@@ -38,7 +38,7 @@ int modbUserByName(stored_conn *sconn, modb_ref *modb, const char *username, int
res = doScalarUsersQuery(sconn, modb, wb, user); res = doScalarUsersQuery(sconn, modb, wb, user);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_groups) { if (res > 0 && with_groups) {
if (modbFetchUserGroups( if (modbFetchUserGroups(
sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups
) < 0) { ) < 0) {
@@ -59,7 +59,7 @@ int modbUserByEmail(stored_conn *sconn, modb_ref *modb, const char *email, int w
res = doScalarUsersQuery(sconn, modb, wb, user); res = doScalarUsersQuery(sconn, modb, wb, user);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_groups) { if (res > 0 && with_groups) {
if (modbFetchUserGroups( if (modbFetchUserGroups(
sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups
) < 0) { ) < 0) {
@@ -83,7 +83,7 @@ int modbUserSearch(stored_conn *sconn, modb_ref *modb, const char *username_emai
res = doScalarUsersQuery(sconn, modb, wb, user); res = doScalarUsersQuery(sconn, modb, wb, user);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_groups) { if (res > 0 && with_groups) {
if (modbFetchUserGroups( if (modbFetchUserGroups(
sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups sconn, modb, 0, (*user)->id, &(*user)->n_groups, &(*user)->groups
) < 0) { ) < 0) {
@@ -111,7 +111,7 @@ int modbUserList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with_
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
} }
if (with_groups) { if (res > 0 && with_groups) {
for (idx = 0; idx < *n_users; idx++) { for (idx = 0; idx < *n_users; idx++) {
user = *((*users) + idx); user = *((*users) + idx);
if (modbFetchUserGroups( if (modbFetchUserGroups(
@@ -266,7 +266,7 @@ int modbGroupById(stored_conn *sconn, modb_ref *modb, unsigned int id, int with_
res = doScalarGroupsQuery(sconn, modb, wb, group); res = doScalarGroupsQuery(sconn, modb, wb, group);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_members) { if (res > 0 && with_members) {
if (modbFetchGroupUsers( if (modbFetchGroupUsers(
sconn, modb, 0, (*group)->id, &(*group)->n_members, &(*group)->members sconn, modb, 0, (*group)->id, &(*group)->n_members, &(*group)->members
) < 0) { ) < 0) {
@@ -287,7 +287,7 @@ int modbGroupByName(stored_conn *sconn, modb_ref *modb, const char *name, int wi
res = doScalarGroupsQuery(sconn, modb, wb, group); res = doScalarGroupsQuery(sconn, modb, wb, group);
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
if (with_members) { if (res > 0 && with_members) {
if (modbFetchGroupUsers( if (modbFetchGroupUsers(
sconn, modb, 0, (*group)->id, &(*group)->n_members, &(*group)->members sconn, modb, 0, (*group)->id, &(*group)->n_members, &(*group)->members
) < 0) { ) < 0) {
@@ -315,7 +315,7 @@ int modbGroupList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with
freeWhereBuilder(&wb); freeWhereBuilder(&wb);
} }
if (with_members) { if (res > 0 && with_members) {
for (idx = 0; idx < *n_groups; idx++) { for (idx = 0; idx < *n_groups; idx++) {
group = *((*groups) + idx); group = *((*groups) + idx);
if (modbFetchGroupUsers( if (modbFetchGroupUsers(