fix a small invalid read.

This commit is contained in:
Simon Morlat 2010-04-08 11:00:50 +02:00
parent 7298779265
commit 28e2ca1c77
2 changed files with 5 additions and 4 deletions

View file

@ -1913,7 +1913,8 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, LinphonePro
int linphone_core_invite(LinphoneCore *lc, const char *url){
LinphoneAddress *addr=linphone_core_interpret_url(lc,url);
if (addr){
int err=linphone_core_invite_address(lc,addr);
int err;
err=linphone_core_invite_address(lc,addr);
linphone_address_destroy(addr);
return err;
}

View file

@ -323,7 +323,7 @@ static void copy_result(const char *src, char *dest, size_t destlen, bool_t esca
i=2;
}
for(;i<destlen-1;++i){
for(;(i<destlen-1) && *src!='\0';++i){
dest[i]=*src;
src++;
}
@ -344,13 +344,13 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
flatten=flatten_number(username);
ms_message("Flattened number is '%s'",flatten);
numlen=strlen(flatten);
if (numlen>10 || flatten[0]=='+' || proxy->dial_prefix==NULL){
if (numlen>10 || flatten[0]=='+' || proxy->dial_prefix==NULL || proxy->dial_prefix[0]=='\0'){
ms_message("No need to add a prefix");
/* prefix is already there */
copy_result(flatten,result,result_len,proxy->dial_escape_plus);
ms_free(flatten);
return 0;
}else if (proxy->dial_prefix){
}else if (proxy->dial_prefix && proxy->dial_prefix[0]!='\0'){
char *prefixed;
int skipped=0;
ms_message("Need to prefix with %s",proxy->dial_prefix);