Skip to content

Commit

Permalink
Efficient string concatenation (#1105)
Browse files Browse the repository at this point in the history
Found by oss-fuzz
  • Loading branch information
catenacyber authored Apr 28, 2020
1 parent 6737387 commit 5bfe94b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions scan_rr.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dns

import (
"bytes"
"encoding/base64"
"net"
"strconv"
Expand All @@ -10,23 +11,23 @@ import (
// A remainder of the rdata with embedded spaces, return the parsed string (sans the spaces)
// or an error
func endingToString(c *zlexer, errstr string) (string, *ParseError) {
var s string
var buffer bytes.Buffer
l, _ := c.Next() // zString
for l.value != zNewline && l.value != zEOF {
if l.err {
return s, &ParseError{"", errstr, l}
return buffer.String(), &ParseError{"", errstr, l}
}
switch l.value {
case zString:
s += l.token
buffer.WriteString(l.token)
case zBlank: // Ok
default:
return "", &ParseError{"", errstr, l}
}
l, _ = c.Next()
}

return s, nil
return buffer.String(), nil
}

// A remainder of the rdata with embedded spaces, split on unquoted whitespace
Expand Down

0 comments on commit 5bfe94b

Please sign in to comment.