diff options
| author | John Levon <john.levon@joyent.com> | 2018-12-19 17:41:39 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-01-24 09:40:11 -0500 |
| commit | 421a607f20240b957c77d8a5a6d34f13da0efb1e (patch) | |
| tree | aa70079d66dbc1712961cb680b2af4aded8d3bdb | |
| parent | 981fe1b1a6ca86e9c41a706462f976f947e6f465 (diff) | |
| download | illumos-joyent-421a607f20240b957c77d8a5a6d34f13da0efb1e.tar.gz | |
10118 libeti() NULL check after deref
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/lib/libeti/form/common/field.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/usr/src/lib/libeti/form/common/field.c b/usr/src/lib/libeti/form/common/field.c index 767ce7d525..c39c9db62d 100644 --- a/usr/src/lib/libeti/form/common/field.c +++ b/usr/src/lib/libeti/form/common/field.c @@ -28,7 +28,9 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2018, Joyent, Inc. + */ /*LINTLIBRARY*/ @@ -337,9 +339,14 @@ field_info(FIELD *f, int *rows, int *cols, int *frow, int *fcol, int set_max_field(FIELD *f, int max) { - BOOLEAN onerow = OneRow(f); + BOOLEAN onerow; + + if (f == NULL) + return (E_BAD_ARGUMENT); + + onerow = OneRow(f); - if (!f || max && ((onerow && f->dcols > max) || + if (max && ((onerow && f->dcols > max) || (!onerow && f->drows > max))) return (E_BAD_ARGUMENT); |