Commit caa82b82 authored by Marek Vavrusa's avatar Marek Vavrusa
Browse files

Merge branch 'deck_test'

parents 2800e375 22e8b6dc
...@@ -353,7 +353,7 @@ fail: ...@@ -353,7 +353,7 @@ fail:
* *
* @param tgt Target buffer to write domain name into. * @param tgt Target buffer to write domain name into.
* @param name Name to be added to the asterisk. * @param name Name to be added to the asterisk.
* @return 0 or error code * @return Size of the resulting name or error code.
*/ */
static int prepend_asterisk(uint8_t *tgt, size_t maxlen, const knot_dname_t *name) static int prepend_asterisk(uint8_t *tgt, size_t maxlen, const knot_dname_t *name)
{ {
...@@ -639,9 +639,10 @@ static int matches_closest_encloser_wildcard(const knot_pkt_t *pkt, knot_section ...@@ -639,9 +639,10 @@ static int matches_closest_encloser_wildcard(const knot_pkt_t *pkt, knot_section
uint8_t wildcard[KNOT_DNAME_MAXLEN]; uint8_t wildcard[KNOT_DNAME_MAXLEN];
int ret = prepend_asterisk(wildcard, sizeof(wildcard), encloser); int ret = prepend_asterisk(wildcard, sizeof(wildcard), encloser);
if (ret != 0) { if (ret < 0) {
return ret; return ret;
} }
assert(ret >= 3);
int flags; int flags;
for (unsigned i = 0; i < sec->count; ++i) { for (unsigned i = 0; i < sec->count; ++i) {
......
deckard @ e73a0854
Subproject commit b1e3c922bdf7e6f47c499ee6c69f07786b68582a Subproject commit e73a0854552d94e8bc5306e75c3a2229bc739531
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment