(krb5_print_address): don't copy size if ret_len == NULL
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11052 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -692,6 +692,7 @@ krb5_error_code
|
|||||||
krb5_print_address (const krb5_address *addr,
|
krb5_print_address (const krb5_address *addr,
|
||||||
char *str, size_t len, size_t *ret_len)
|
char *str, size_t len, size_t *ret_len)
|
||||||
{
|
{
|
||||||
|
size_t ret;
|
||||||
struct addr_operations *a = find_atype(addr->addr_type);
|
struct addr_operations *a = find_atype(addr->addr_type);
|
||||||
|
|
||||||
if (a == NULL) {
|
if (a == NULL) {
|
||||||
@@ -712,10 +713,13 @@ krb5_print_address (const krb5_address *addr,
|
|||||||
len -= l;
|
len -= l;
|
||||||
s += l;
|
s += l;
|
||||||
}
|
}
|
||||||
|
if(ret_len != NULL)
|
||||||
*ret_len = s - str;
|
*ret_len = s - str;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
*ret_len = (*a->print_addr)(addr, str, len);
|
ret = (*a->print_addr)(addr, str, len);
|
||||||
|
if(ret_len != NULL)
|
||||||
|
*ret_len = ret;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user