diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-06-20 09:16:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:18:52 -0500 |
| commit | 3c34f6085af1e168a1fe7602ae01ba643a7781bd (patch) | |
| tree | 5f789a2262f68bbf41895fa3d4242abfa1651750 /source3/utils | |
| parent | ce61fb21d948bd8e3c7733d542f8ecae1390cbfc (diff) | |
| download | samba-3c34f6085af1e168a1fe7602ae01ba643a7781bd.tar.gz samba-3c34f6085af1e168a1fe7602ae01ba643a7781bd.tar.bz2 samba-3c34f6085af1e168a1fe7602ae01ba643a7781bd.zip | |
r16409: Fix Klocwork ID's.
1177
In reg_perfcount.c: 1200 1202 1203 1204
In regfio.c: 1243 1245 1246 1247 1251
Jerry, the reg_perfcount and regfio.c ones, can you take a look please? This
is really your code, and I'm not sure I did the right thing to return an
error.
smbcacls.c: 1377
srv_eventlog_nt.c: 1415 1416 1417
srv_lsa_nt.c: 1420 1421
srv_netlog_nt.c: 1429
srv_samr_nt: 1458 1459 1460
Volker
Volker
(This used to be commit d6547d12b1c9f9454876665a5bdb010f46b9f5ff)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/profiles.c | 5 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index 9629dffaea..d40a2deea3 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -213,7 +213,10 @@ int main( int argc, char *argv[] ) /* actually do the update now */ - nk = regfio_rootkey( infile ); + if ((nk = regfio_rootkey( infile )) == NULL) { + fprintf(stderr, "Could not get rootkey\n"); + exit(3); + } if ( !copy_registry_tree( infile, nk, NULL, outfile, "" ) ) { fprintf(stderr, "Failed to write updated registry file!\n"); diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 1c34cd32a6..b31fd95f7a 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -360,11 +360,12 @@ static BOOL add_ace(SEC_ACL **the_acl, SEC_ACE *ace) SEC_ACL *new_ace; SEC_ACE *aces; if (! *the_acl) { - (*the_acl) = make_sec_acl(ctx, 3, 1, ace); - return True; + return (((*the_acl) = make_sec_acl(ctx, 3, 1, ace)) != NULL); } - aces = SMB_CALLOC_ARRAY(SEC_ACE, 1+(*the_acl)->num_aces); + if (!(aces = SMB_CALLOC_ARRAY(SEC_ACE, 1+(*the_acl)->num_aces))) { + return False; + } memcpy(aces, (*the_acl)->ace, (*the_acl)->num_aces * sizeof(SEC_ACE)); memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE)); new_ace = make_sec_acl(ctx,(*the_acl)->revision,1+(*the_acl)->num_aces, aces); |