Skip to content

Commit 81c8165

Browse files
committed
Fix panic in TextMBB for empty message
Signed-off-by: Glenn Lewis <[email protected]>
1 parent 35a5497 commit 81c8165

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

fonts/freeserif/font_test.go

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package freeserif
2+
3+
import (
4+
"testing"
5+
6+
"github.com/gmlewis/go-fonts/fonts"
7+
)
8+
9+
func TestTextMBB(t *testing.T) {
10+
// See: https://github.com/gmlewis/go-gerber/issues/8
11+
if _, err := fonts.TextMBB(0, 0, 1, 1, "", "freeserif"); err == nil {
12+
t.Error("TextMBB = nil, want err")
13+
}
14+
}

fonts/text.go

+4
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ func TextMBB(xPos, yPos, xScale, yScale float64, message, fontName string) (*MBB
187187
}
188188
}
189189

190+
if result == nil {
191+
return nil, errors.New("message must not be empty")
192+
}
193+
190194
// log.Printf("TextMBB: xScale,yScale=(%v,%v)", xScale, yScale)
191195
fsf := 1.0 / font.UnitsPerEm
192196
xScale *= fsf

0 commit comments

Comments
 (0)