|
 |
6c3643 |
diff -up scrub-2.6.1/src/fillfile.c.analyzer-fixes scrub-2.6.1/src/fillfile.c
|
|
|
6c3643 |
--- scrub-2.6.1/src/fillfile.c.analyzer-fixes 2021-03-18 10:42:37.201845461 -0400
|
|
|
6c3643 |
+++ scrub-2.6.1/src/fillfile.c 2021-03-18 10:43:38.358151439 -0400
|
|
|
6c3643 |
@@ -131,10 +131,13 @@ refill_init(struct memstruct **mpp, refi
|
|
|
6c3643 |
|
|
|
6c3643 |
if (!(mp = malloc(sizeof(struct memstruct))))
|
|
|
6c3643 |
goto nomem;
|
|
|
6c3643 |
- if (!(mp->buf = malloc(memsize)))
|
|
|
6c3643 |
+ if (!(mp->buf = malloc(memsize))) {
|
|
|
6c3643 |
+ free(mp);
|
|
|
6c3643 |
goto nomem;
|
|
|
6c3643 |
+ }
|
|
|
6c3643 |
mp->size = memsize;
|
|
|
6c3643 |
mp->refill = refill;
|
|
|
6c3643 |
+ mp->thd = 0;
|
|
|
6c3643 |
#if WITH_PTHREADS
|
|
|
6c3643 |
if (!no_threads) {
|
|
|
6c3643 |
if ((mp->err = pthread_create(&mp->thd, NULL, refill_thread, mp))) {
|
|
|
6c3643 |
diff -up scrub-2.6.1/src/scrub.c.analyzer-fixes scrub-2.6.1/src/scrub.c
|
|
|
6c3643 |
diff -up scrub-2.6.1/src/sig.c.analyzer-fixes scrub-2.6.1/src/sig.c
|
|
|
6c3643 |
--- scrub-2.6.1/src/sig.c.analyzer-fixes 2021-03-18 10:44:20.715363360 -0400
|
|
|
6c3643 |
+++ scrub-2.6.1/src/sig.c 2021-03-18 10:44:54.319531489 -0400
|
|
|
6c3643 |
@@ -74,7 +74,7 @@ writesig(char *path)
|
|
|
6c3643 |
goto nomem;
|
|
|
6c3643 |
if ((fd = open(path, O_RDWR)) < 0)
|
|
|
6c3643 |
goto error;
|
|
|
6c3643 |
- if ((n = read_all(fd, buf, blocksize)) < 0)
|
|
|
6c3643 |
+ if (read_all(fd, buf, blocksize) < 0)
|
|
|
6c3643 |
goto error;
|
|
|
6c3643 |
memcpy(buf, SCRUB_MAGIC, sizeof(SCRUB_MAGIC));
|
|
|
6c3643 |
if (lseek(fd, 0, SEEK_SET) < 0)
|