apply post-1.15.1 fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 5281d8118..381f60075 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -286,25 +286,26 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
-                if (flags & FLAG_NOERROR) /* Pre-zero the buffer if conv=noerror */
-                        memset(ibuf, 0, ibs);
                 n = safe_read(ifd, ibuf, ibs);
                 if (n == 0)
                         break;
                 if (n < 0) {
+                        /* "Bad block" */
                         if (!(flags & FLAG_NOERROR))
                                 goto die_infile;
-                        n = ibs;
                         bb_simple_perror_msg(infile);
-                        /* GNU dd with conv=noerror skips over "bad blocks" */
+                        /* GNU dd with conv=noerror skips over bad blocks */
                         xlseek(ifd, ibs, SEEK_CUR);
+                        /* conv=noerror,sync writes NULs,
+                         * conv=noerror just ignores input bad blocks */
+                        n = 0;
                 }
                 if ((size_t)n == ibs)
                         G.in_full++;
                 else {
                         G.in_part++;
                         if (flags & FLAG_SYNC) {
-                                memset(ibuf + n, '\0', ibs - n);
+                                memset(ibuf + n, 0, ibs - n);
                                 n = ibs;
                         }
                 }
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 126eaeef9..e703659c6 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -84,6 +84,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
                                 break;
                         }
 
+                        free((char*)s1);
                         ++dups;  /* note: testing for overflow seems excessive. */
                 }