Changeset 2900 for releases

Show
Ignore:
Timestamp:
04/26/06 10:01:08 (3 years ago)
Author:
aj
Message:

close memory leaks.

Location:
releases/opensc-0.11.0/src/pkcs15init
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • releases/opensc-0.11.0/src/pkcs15init/pkcs15-cflex.c

    r2811 r2900  
    8484static int cflex_erase_card(struct sc_profile *profile, sc_card_t *card) 
    8585{ 
    86         sc_file_t  *df = profile->df_info->file, *dir, *userpinfile; 
     86        sc_file_t  *df = profile->df_info->file, *dir, *userpinfile = NULL; 
    8787        int             r; 
    8888 
    … …  
    109109                r = cflex_delete_file(profile, card, userpinfile); 
    110110                sc_file_free(userpinfile); 
     111                userpinfile=NULL; 
    111112        } 
    112113 
    113114 
    114115out:    /* Forget all cached keys, the pin files on card are all gone. */ 
     116        if (userpinfile) 
     117                sc_file_free(userpinfile); 
    115118        sc_keycache_forget_key(NULL, -1, -1); 
    116119        sc_free_apps(card); 

  • releases/opensc-0.11.0/src/pkcs15init/pkcs15-gpk.c

    r2829 r2900  
    321321                sc_error(card->ctx, 
    322322                        "PIN file most be protected by WRITE=NEVER"); 
     323                sc_file_free(pinfile); 
    323324                return SC_ERROR_INVALID_ARGUMENTS; 
    324325        }