diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 13:08:22 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-06-24 23:16:15 +0300 |
| commit | 3970c09844d4f5e54234620de153ab71a05afbca (patch) | |
| tree | 88e2d10f88649aeaf3862bc083635ef4275d1324 /usr/src/lib/libpkg/common/dstream.c | |
| parent | f00128d8e2d39a5be61357047531dc79fde48623 (diff) | |
| download | illumos-joyent-3970c09844d4f5e54234620de153ab71a05afbca.tar.gz | |
11149 libpkg: NULL pointer errors
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libpkg/common/dstream.c')
| -rw-r--r-- | usr/src/lib/libpkg/common/dstream.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/lib/libpkg/common/dstream.c b/usr/src/lib/libpkg/common/dstream.c index 6622b74361..d2844d877b 100644 --- a/usr/src/lib/libpkg/common/dstream.c +++ b/usr/src/lib/libpkg/common/dstream.c @@ -91,7 +91,7 @@ struct dstoc { #define ds_nparts ds_toc->nparts #define ds_maxsiz ds_toc->maxsiz -int ds_totread; /* total number of parts read */ +int ds_totread; /* total number of parts read */ int ds_fd = -1; int ds_curpartcnt = -1; @@ -100,16 +100,16 @@ int ds_ginit(char *device); int ds_close(int pkgendflg); static FILE *ds_pp; -static int ds_realfd = -1; /* file descriptor for real device */ -static int ds_read; /* number of parts read for current package */ -static int ds_volno; /* volume number of current volume */ -static int ds_volcnt; /* total number of volumes */ -static char ds_volnos[128]; /* parts/volume info */ +static int ds_realfd = -1; /* file descriptor for real device */ +static int ds_read; /* number of parts read for current package */ +static int ds_volno; /* volume number of current volume */ +static int ds_volcnt; /* total number of volumes */ +static char ds_volnos[128]; /* parts/volume info */ static char *ds_device; static int ds_volpart; /* number of parts read in current volume, */ /* including skipped parts */ static int ds_bufsize; -static int ds_skippart; /* number of parts skipped in current volume */ +static int ds_skippart; /* number of parts skipped in current volume */ static int ds_getnextvol(char *device); static int ds_skip(char *device, int nskip); @@ -299,7 +299,7 @@ ds_init(char *device, char **pkg, char *norewind) char line[LSIZE+1]; int i, n, count = 0, header_size = BLK_SIZE; - if (!ds_header) { /* If the header hasn't been read yet */ + if (!ds_header) { /* If the header hasn't been read yet */ if (ds_fd >= 0) (void) ds_close(0); @@ -608,7 +608,7 @@ ds_getnextvol(char *device) (void) sprintf(prompt, pkg_gt("Insert %%v %d of %d into %%p"), ds_volno, ds_volcnt); - if (n = getvol(device, NULL, NULL, prompt)) + if (n = getvol(device, NULL, 0, prompt)) return (n); if ((ds_fd = open(device, O_RDONLY)) < 0) return (-1); |