- if ((s2 = memchr(r->data, 0, r->size))) {
- s2++;
- if (memchr(s2, 0, r->size - ((char*) s2 - (char*) r->data)))
- snprintf(t, sizeof(t), "'%s' '%s'", (char*) r->data, s2);
+ l = r->size;
+ if (l > sizeof(t)-1)
+ l = sizeof(t)-1;
+
+ memcpy(t, r->data, l);
+ t[l] = 0;
+ break;
+ }
+
+ case FLX_DNS_TYPE_TXT: {
+
+ if (r->size == 0)
+ t[0] = 0;
+ else {
+ guchar l = ((guchar*) r->data)[0];
+
+ if ((size_t) l+1 <= r->size) {
+ memcpy(t, r->data+1, ((guchar*) r->data)[0]);
+ t[((guchar*) r->data)[0]] = 0;
+ }
+ }
+ break;
+ }
+
+ case FLX_DNS_TYPE_HINFO: {
+ gchar *s2;
+ gchar hi1[256], hi2[256];
+ guchar len;
+
+ if ((size_t) (len = ((guchar*) r->data)[0]) + 2 <= r->size) {
+ guchar len2;
+ memcpy(hi1, (gchar*) r->data +1, len);
+ hi1[len] = 0;
+
+ if ((size_t) (len2 = ((guchar*) r->data)[len+1]) + len + 2 <= r->size) {
+ memcpy(hi2, (gchar*) r->data+len+2, len2);
+ hi2[len2] = 0;
+ snprintf(t, sizeof(t), "'%s' '%s'", hi1, hi2);
+ }
+
+ }
+
+ break;
+ }
+
+ case FLX_DNS_TYPE_SRV: {
+ char k[257];
+ size_t l;
+
+ l = r->size-6;
+ if (l > sizeof(k)-1)
+ l = sizeof(k)-1;
+
+ memcpy(k, r->data+6, l);
+ k[l] = 0;
+
+ snprintf(t, sizeof(t), "%u %u %u %s",
+ ntohs(((guint16*) r->data)[0]),
+ ntohs(((guint16*) r->data)[1]),
+ ntohs(((guint16*) r->data)[2]),
+ k);
+ break;