settings: fix the save in gzip format

tvheadend · Feb 11, 2016 · 553ef4f · 553ef4f
1 parent f5c85bc
commit 553ef4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/settings.c b/src/settings.c
@@ -183,8 +183,8 @@ hts_settings_save(htsmsg_t *record, const char *pathfmt, ...)
   } else {
 #if ENABLE_ZLIB
     r = htsmsg_binary_serialize(record, &msgdata, &msglen, 0x10000);
-    if (!r) {
-      r = tvh_gzip_deflate_fd_header(fd, msgdata, msglen, 3);
+    if (!r && msglen >= 4) {
+      r = tvh_gzip_deflate_fd_header(fd, msgdata + 4, msglen - 4, 3);
       if (r)
         ok = 0;
     }

diff --git a/src/zlib.c b/src/zlib.c
@@ -162,12 +162,14 @@ int tvh_gzip_deflate_fd_header ( int fd, const uint8_t *data, size_t orig, int s
   r = tvh_write(fd, "\xff\xffGZIP00\x00\x00\x00\x00", 12);
   if (r)
     return 1;
-  r = tvh_gzip_deflate_fd(fd, data, orig, &size, 3) < 0;
-  if (r || size > UINT_MAX)
-    return 1;
-  r = lseek(fd, 8, SEEK_SET) != (off_t)8;
-  if (r)
-    return 1;
+  if (orig > 0) {
+    r = tvh_gzip_deflate_fd(fd, data, orig, &size, 3) < 0;
+    if (r || size > UINT_MAX)
+      return 1;
+    r = lseek(fd, 8, SEEK_SET) != (off_t)8;
+    if (r)
+      return 1;
+  }
   data2[0] = (orig >> 24) & 0xff;
   data2[1] = (orig >> 16) & 0xff;
   data2[2] = (orig >> 8) & 0xff;