agorise/c-multiaddr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed encapsulation

Browse source 
Now working properly.
This commit is contained in:
xethyrion 2017-02-21 20:55:28 +02:00 committed by GitHub
parent 0b8789ebbc
commit 2a470ee856
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
multiaddr.c
View file

@ -141,15 +141,34 @@ int multiaddress_encapsulate(struct MultiAddress* result, char* string)
free(result->bytes); free(result->bytes);
result->bytes = NULL; result->bytes = NULL;
result->bsize = 0; result->bsize = 0;
char * exstr;
if(string[0] == '/')
{
exstr = (char *) malloc(strlen(result->string)+1);
}
else
{
exstr = (char *) malloc(strlen(result->string));
}
strcpy(exstr, result->string);
free(result->string); free(result->string);
// insert the new values // insert the new values
result->string = malloc(strlen(string) + 1); result->string = malloc(strlen(string) + strlen(exstr) + 1);
if (result->string == NULL) { if (result->string == NULL) {
multiaddress_free(result); multiaddress_free(result);
return 0; return 0;
} }
strcpy(result->string, string); strcpy(result->string, exstr);
if(string_to_bytes(&result->bytes, &result->bsize, result->string, sizeof(result->string)) == 0) free(exstr);
if(string[0] == '/')
{
strcat(result->string, string+1);
}
else
{
strcat(result->string, string);
}
if(string_to_bytes(&result->bytes, &result->bsize, result->string, strlen(result->string)+1) == 0)
{ {
multiaddress_free(result); multiaddress_free(result);
return 0; return 0;
@ -209,4 +228,3 @@ int multiaddress_decapsulate(struct MultiAddress * result, char * srci)
return 0; return 0;
} }
} }