diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2010-07-06 12:24:08 -0500 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2010-08-23 17:08:17 -0700 |
| commit | ecaf325734a2795cb3d841f513a0c7c775e0aca9 (patch) | |
| tree | ae78be3110d63cd60769d33cb8141c517c0d3ebc | |
| parent | 47c59c424a1246e1d1dd2fb1605991081db685c9 (diff) | |
| download | ds-ecaf325734a2795cb3d841f513a0c7c775e0aca9.tar.gz ds-ecaf325734a2795cb3d841f513a0c7c775e0aca9.tar.xz ds-ecaf325734a2795cb3d841f513a0c7c775e0aca9.zip | |
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
https://bugzilla.redhat.com/show_bug.cgi?id=611790
Resolves: bug 611790
Bug description: Fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Fix description: Catch possible NULL pointer in age_str2time().
| -rw-r--r-- | ldap/servers/plugins/retrocl/retrocl_trim.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c index e16049d8..7e977369 100644 --- a/ldap/servers/plugins/retrocl/retrocl_trim.c +++ b/ldap/servers/plugins/retrocl/retrocl_trim.c @@ -441,12 +441,16 @@ age_str2time (const char *age) } maxage = slapi_ch_strdup ( age ); + if (!maxage) { + slapi_log_error( SLAPI_LOG_PLUGIN, "retrocl", + "age_str2time: Out of memory\n" ); + ageval = -1; + goto done; + } + unit = maxage[ strlen( maxage ) - 1 ]; maxage[ strlen( maxage ) - 1 ] = '\0'; ageval = strntoul( maxage, strlen( maxage ), 10 ); - if ( maxage) { - slapi_ch_free ( (void **) &maxage ); - } switch ( unit ) { case 's': break; @@ -468,7 +472,10 @@ age_str2time (const char *age) "for maxiumum changelog age\n", unit ); ageval = -1; } - +done: + if ( maxage) { + slapi_ch_free ( (void **) &maxage ); + } return ageval; } |