shithub: fnt

Info  •  Files  •  Log  •  Branches

mkattr: protect against "hex" used on non-numbers

--- a/otf.rkt

+++ b/otf.rkt

@@ -369,6 +369,11 @@

 (define-for-syntax (type-comparable? type)

   (member type '(uint8 int8 uint16 int16 uint24 uint32 int32 Version16Dot16)))

+; types allowed to be used in comparisons

+(define-for-syntax (type-number? type)

+  (member type

+          '(uint8 int8 uint16 int16 uint24 uint32 int32 Version16Dot16 Offset16 Offset24 Offset32)))

+

 (define-for-syntax fields '())

 (define-syntax (mkattr stx)

@@ -379,7 +384,11 @@

          (raise-syntax-error #f "can't be used as an offset" stx #'offType))

        #''(ptr type name))]

     [(_ _ (n:number)) #''(count n)]

-    [(_ _ {~literal hex}) #''(verb "%#ux")]

+    [(_ type {~literal hex})

+     (begin

+       (when (not (type-number? (syntax->datum #`type)))

+         (raise-syntax-error #f "not a number type" stx #'type))

+       #''(verb "%#ux"))]

     [(_ type (p:expr vs:number ...+))

      (begin

        (when (not (type-comparable? (syntax->datum #`type)))