summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-06-06 19:58:36 +0000
committerJames Bursa <james@netsurf-browser.org>2004-06-06 19:58:36 +0000
commit07c981bfc7c1e3fd036f4c7a62d5af8a7411dea3 (patch)
tree2d009edfcd0bea38642b01a2224ba4ca34e468d9
parenta6f59ccd7665eeca3fa475425e86d9b5ad8d7a43 (diff)
downloadnetsurf-07c981bfc7c1e3fd036f4c7a62d5af8a7411dea3.tar.gz
netsurf-07c981bfc7c1e3fd036f4c7a62d5af8a7411dea3.tar.bz2
[project @ 2004-06-06 19:58:36 by bursa]
Stricter preconditions for enumerate_fonts(). svn path=/import/netsurf/; revision=933
-rw-r--r--riscos/font.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/riscos/font.c b/riscos/font.c
index 0fea4b542..5a55d28b2 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -130,12 +130,9 @@ const char *enumerate_fonts(struct font_set* set, int *handle)
{
int i;
- assert(set);
-
- if (*handle < 0 || handle == 0) { /* a bit of sanity checking */
- *handle = -1;
- return NULL;
- }
+ assert(set);
+ assert(handle);
+ assert(0 <= *handle && *handle <= FONT_FAMILIES * FONT_FACES);
for (i = *handle; i!=FONT_FAMILIES*FONT_FACES && set->font[i]==0;
i++) ; /* find next font in use */