chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixes.
[adns.git]
/
src
/
query.c
diff --git
a/src/query.c
b/src/query.c
index 1d4dc5fd94df3753d7e9107a5630763482e6bf44..92bb2282a6265084ace73d820dd60c2db8018afa 100644
(file)
--- a/
src/query.c
+++ b/
src/query.c
@@
-200,7
+200,7
@@
void *adns__alloc_final(adns_query qu, size_t sz) {
}
void adns__reset_cnameonly(adns_query qu) {
}
void adns__reset_cnameonly(adns_query qu) {
- assert(qu->final_allocspace);
+ assert(
!
qu->final_allocspace);
qu->answer->nrrs= 0;
qu->answer->rrs= 0;
qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
qu->answer->nrrs= 0;
qu->answer->rrs= 0;
qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
@@
-242,6
+242,7
@@
void adns__makefinal_str(adns_query qu, char **strp) {
char *before, *after;
before= *strp;
char *before, *after;
before= *strp;
+ if (!before) return;
l= strlen(before)+1;
after= adns__alloc_final(qu,l);
memcpy(after,before,l);
l= strlen(before)+1;
after= adns__alloc_final(qu,l);
memcpy(after,before,l);
@@
-249,10
+250,12
@@
void adns__makefinal_str(adns_query qu, char **strp) {
}
void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
}
void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
- void *after;
+ void *
before, *
after;
+ before= *blpp;
+ if (!before) return;
after= adns__alloc_final(qu,sz);
after= adns__alloc_final(qu,sz);
- memcpy(after,
*blpp
,sz);
+ memcpy(after,
before
,sz);
*blpp= after;
}
*blpp= after;
}