diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-12 17:15:03 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-12 17:15:03 +0100 |
| commit | 963cfc9a6f6e721f52aa949e6d1af0c3e8dc2ecc (patch) | |
| tree | 749b74875dbc49bcf6ed0776648b8f0ef9417407 /sys/src/cmd/upas/vf | |
| parent | 8177d20fb2709ba9290dfd41308b8e5bee4e00f8 (diff) | |
merging erik quanstros nupas
Diffstat (limited to 'sys/src/cmd/upas/vf')
| -rw-r--r-- | sys/src/cmd/upas/vf/mkfile | 3 | ||||
| -rw-r--r-- | sys/src/cmd/upas/vf/vf.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/src/cmd/upas/vf/mkfile b/sys/src/cmd/upas/vf/mkfile index 5f0981a39..3a7c1c1de 100644 --- a/sys/src/cmd/upas/vf/mkfile +++ b/sys/src/cmd/upas/vf/mkfile @@ -1,4 +1,5 @@ </$objtype/mkfile +<../mkupas TARG=vf @@ -9,8 +10,6 @@ LIB=../common/libcommon.a$O\ HFILES=../common/common.h\ ../common/sys.h\ - -BIN=/$objtype/bin/upas UPDATE=\ mkfile\ $HFILES\ diff --git a/sys/src/cmd/upas/vf/vf.c b/sys/src/cmd/upas/vf/vf.c index d73fbe47f..92ec86515 100644 --- a/sys/src/cmd/upas/vf/vf.c +++ b/sys/src/cmd/upas/vf/vf.c @@ -954,7 +954,7 @@ tokenconvert(String *t) { String *s; char decoded[1024]; - char utfbuf[UTFmax*1024]; + char utfbuf[2*1024]; int i, len; char *e; char *token; @@ -986,6 +986,8 @@ tokenconvert(String *t) if(cistrncmp(token, "b?", 2) == 0){ token += 2; len = dec64((uchar*)decoded, sizeof(decoded), token, e-token); + if(len == -1) + goto err; decoded[len] = 0; } else if(cistrncmp(token, "q?", 2) == 0){ token += 2; |