GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed memory corruption bug

Browse Source
This commit is contained in:
Steffen Hansen 2002-07-01 12:52:29 +00:00
parent a4b45557ea
commit 7a826e3f35
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gpgmeplug/gpgmeplug.c
View File

@ -1726,13 +1726,15 @@ xmalloc (size_t n)
return p; return p;
} }
/* Please: Don't call an allocation function xfoo when it may return NULL. */
/* Wrong: #define xstrdup( x ) (x)?strdup(x):0 */
/* Right: */
static char * static char *
xstrdup (const char *string) xstrdup (const char *string)
{ {
char *p = xmalloc (strlen (string)); char *p;
if( !string ) {
fputs ("\nfatal: xstrdup(NULL)\n", stderr);
exit (4);
}
p = xmalloc (strlen (string)+1);
strcpy (p, string); strcpy (p, string);
return p; return p;
} }
@ -2013,7 +2015,7 @@ startListCertificates( const char* pattern, int remote )
GpgmeError err; GpgmeError err;
struct CertIterator* it; struct CertIterator* it;
const char* patterns[] = { pattern, NULL }; const char* patterns[] = { pattern, NULL };
fprintf( stderr, "startListCertificates( \"%s\", %d )", pattern, remote ); fprintf( stderr, "startListCertificates( \"%s\", %d )\n", pattern, remote );
it = xmalloc( sizeof( struct CertIterator ) ); it = xmalloc( sizeof( struct CertIterator ) );
@ -2029,6 +2031,7 @@ startListCertificates( const char* pattern, int remote )
else gpgme_set_keylist_mode ( it->ctx, GPGME_KEYLIST_MODE_LOCAL ); else gpgme_set_keylist_mode ( it->ctx, GPGME_KEYLIST_MODE_LOCAL );
err = gpgme_op_keylist_ext_start ( it->ctx, patterns, 0, 0); err = gpgme_op_keylist_ext_start ( it->ctx, patterns, 0, 0);
if( err != GPGME_No_Error ) { if( err != GPGME_No_Error ) {
fprintf( stderr, "gpgme_op_keylist_ext_start returned %d", err );
endListCertificates( it ); endListCertificates( it );
return NULL; return NULL;
} }
@ -2095,6 +2098,7 @@ nextCertificate( struct CertIterator* it, struct CertificateInfo** result )
GpgmeKey key; GpgmeKey key;
int retval = GPGME_No_Error; int retval = GPGME_No_Error;
assert( it ); assert( it );
fprintf( stderr, "nextCertificates( %p, %p )\n", it, result );
err = gpgme_op_keylist_next ( it->ctx, &key); err = gpgme_op_keylist_next ( it->ctx, &key);
if( err != GPGME_EOF ) { if( err != GPGME_EOF ) {
int idx; int idx;
@ -2182,9 +2186,9 @@ nextCertificate( struct CertIterator* it, struct CertificateInfo** result )
int int
endListCertificates( struct CertIterator* it ) endListCertificates( struct CertIterator* it )
{ {
/*fprintf( stderr, "endListCertificates()\n" );*/
char *s = gpgme_get_op_info (it->ctx, 0); char *s = gpgme_get_op_info (it->ctx, 0);
int truncated = s && strstr (s, "<truncated/>"); int truncated = s && strstr (s, "<truncated/>");
fprintf( stderr, "endListCertificates( %p )\n", it );
if( s ) free( s ); if( s ) free( s );
assert(it); assert(it);
freeInfo( &(it->info) ); freeInfo( &(it->info) );