1 files changed, 143 insertions, 141 deletions

diff --git a/src/plugins/deb_extractor.c b/src/plugins/deb_extractor.c
index 2eb0028..16c6285 100644
--- a/src/plugins/deb_extractor.c
+++ b/src/plugins/deb_extractor.c
@@ -122,8 +122,8 @@ static struct Matches tmap[] = {
 static int
 processControl (const char *data,
                 const size_t size,
-                EXTRACTOR_MetaDataProcessor proc,
-                void *proc_cls)
+                EXTRACTOR_MetaDataProcessor proc,
+                void *proc_cls)
 {
   size_t pos;
   char *key;
@@ -134,49 +134,49 @@ processControl (const char *data,
 
   pos = 0;
   while (pos < size)
-    {
-      for (colon = pos; ':' != data[colon]; colon++)
-        if ((colon > size) || ('\n' == data[colon]))
-          return 0;
+  {
+    for (colon = pos; ':' != data[colon]; colon++)
+      if ((colon > size) || ('\n' == data[colon]))
+        return 0;
+    colon++;
+    while ((colon < size) && (isspace ((unsigned char) data[colon])))
       colon++;
-      while ((colon < size) && (isspace ((unsigned char) data[colon])))
-        colon++;
-      eol = colon;
-      while ((eol < size) &&
-             (('\n' != data[eol]) ||
-              ((eol + 1 < size) && (' '  == data[eol + 1]))))
-        eol++;
-      if ((eol == colon) || (eol > size))
+    eol = colon;
+    while ((eol < size) &&
+           (('\n' != data[eol]) ||
+            ((eol + 1 < size) && (' '  == data[eol + 1]))))
+      eol++;
+    if ((eol == colon) || (eol > size))
+      return 0;
+    if (NULL == (key = stndup (&data[pos], colon - pos)))
+      return 0;
+    for (i = 0; NULL != tmap[i].text; i++)
+    {
+      if (0 != strcmp (key, tmap[i].text))
+        continue;
+      if (NULL == (val = stndup (&data[colon], eol - colon)))
+      {
+        free (key);
         return 0;
-      if (NULL == (key = stndup (&data[pos], colon - pos)))
-        return 0;
-      for (i = 0; NULL != tmap[i].text; i++)
-        {
-          if (0 != strcmp (key, tmap[i].text))
-            continue;
-          if (NULL == (val = stndup (&data[colon], eol - colon)))
-            {
-              free (key);
-              return 0;
-            }
-          if (0 != proc (proc_cls,
-                         "deb",
-                         tmap[i].type,
-                         EXTRACTOR_METAFORMAT_UTF8,
-                         "text/plain",
-                         val,
-                         strlen(val) + 1))
-            {
-              free (val);
-              free (key);
-              return 1;
-            }
-          free (val);
-          break;
-        }
-      free (key);
-      pos = eol + 1;
+      }
+      if (0 != proc (proc_cls,
+                     "deb",
+                     tmap[i].type,
+                     EXTRACTOR_METAFORMAT_UTF8,
+                     "text/plain",
+                     val,
+                     strlen (val) + 1))
+      {
+        free (val);
+        free (key);
+        return 1;
+      }
+      free (val);
+      break;
     }
+    free (key);
+    pos = eol + 1;
+  }
   return 0;
 }
 
@@ -291,9 +291,9 @@ struct USTarHeader
  */
 static int
 processControlTar (const char *data,
-                   size_t size,
-                   EXTRACTOR_MetaDataProcessor proc,
-                   void *proc_cls)
+                   size_t size,
+                   EXTRACTOR_MetaDataProcessor proc,
+                   void *proc_cls)
 {
   struct TarHeader *tar;
   struct USTarHeader *ustar;
@@ -301,42 +301,42 @@ processControlTar (const char *data,
 
   pos = 0;
   while (pos + sizeof (struct TarHeader) < size)
+  {
+    unsigned long long fsize;
+    char buf[13];
+
+    tar = (struct TarHeader *) &data[pos];
+    if (pos + sizeof (struct USTarHeader) < size)
     {
-      unsigned long long fsize;
-      char buf[13];
-
-      tar = (struct TarHeader *) & data[pos];
-      if (pos + sizeof (struct USTarHeader) < size)
-        {
-          ustar = (struct USTarHeader *) & data[pos];
-          if (0 == strncmp ("ustar", &ustar->magic[0], strlen ("ustar")))
-            pos += 512;         /* sizeof (struct USTarHeader); */
-          else
-            pos += 257;         /* sizeof (struct TarHeader); minus gcc alignment... */
-        }
+      ustar = (struct USTarHeader *) &data[pos];
+      if (0 == strncmp ("ustar", &ustar->magic[0], strlen ("ustar")))
+        pos += 512;             /* sizeof (struct USTarHeader); */
       else
-        {
-          pos += 257;           /* sizeof (struct TarHeader); minus gcc alignment... */
-        }
+        pos += 257;             /* sizeof (struct TarHeader); minus gcc alignment... */
+    }
+    else
+    {
+      pos += 257;               /* sizeof (struct TarHeader); minus gcc alignment... */
+    }
 
-      memcpy (buf, &tar->filesize[0], 12);
-      buf[12] = '\0';
-      if (1 != sscanf (buf, "%12llo", &fsize))  /* octal! Yuck yuck! */
-        return 0;
-      if ((pos + fsize > size) || (fsize > size) || (pos + fsize < pos))
-        return 0;
+    memcpy (buf, &tar->filesize[0], 12);
+    buf[12] = '\0';
+    if (1 != sscanf (buf, "%12llo", &fsize))    /* octal! Yuck yuck! */
+      return 0;
+    if ((pos + fsize > size) || (fsize > size) || (pos + fsize < pos))
+      return 0;
 
-      if (0 == strncmp (&tar->name[0], "./control", strlen ("./control")))
-        {
-          /* found the 'control' file we were looking for */
-          return processControl (&data[pos], fsize, proc, proc_cls);
-        }
-      if (0 != (fsize & 511))
-        fsize = (fsize | 511) + 1;      /* round up! */
-      if (pos + fsize < pos)
-        return 0;
-      pos += fsize;
+    if (0 == strncmp (&tar->name[0], "./control", strlen ("./control")))
+    {
+      /* found the 'control' file we were looking for */
+      return processControl (&data[pos], fsize, proc, proc_cls);
     }
+    if (0 != (fsize & 511))
+      fsize = (fsize | 511) + 1;        /* round up! */
+    if (pos + fsize < pos)
+      return 0;
+    pos += fsize;
+  }
   return 0;
 }
 
@@ -371,42 +371,43 @@ processControlTGZ (struct EXTRACTOR_ExtractContext *ec,
     return 0;
   off = 0;
   while (off < size)
-    {
-      if (0 >= (sret = ec->read (ec->cls, &data, size - off)))
-        {
-          free (cdata);
-          return 0;
-        }
-      memcpy (&cdata[off],
-              data,
-              sret);
-      off += sret;
-    }
-  bufSize = cdata[size - 4] + (cdata[size - 3] << 8) + (cdata[size - 2] << 16) + (cdata[size - 1] << 24);
-  if (bufSize > MAX_CONTROL_SIZE)
+  {
+    if (0 >= (sret = ec->read (ec->cls, &data, size - off)))
     {
       free (cdata);
       return 0;
     }
+    memcpy (&cdata[off],
+            data,
+            sret);
+    off += sret;
+  }
+  bufSize = cdata[size - 4] + (cdata[size - 3] << 8) + (cdata[size - 2] << 16)
+            + (cdata[size - 1] << 24);
+  if (bufSize > MAX_CONTROL_SIZE)
+  {
+    free (cdata);
+    return 0;
+  }
   if (NULL == (buf = malloc (bufSize)))
-    {
-      free (cdata);
-      return 0;
-    }
+  {
+    free (cdata);
+    return 0;
+  }
   ret = 0;
   memset (&strm, 0, sizeof (z_stream));
   strm.next_in = (Bytef *) data;
   strm.avail_in = size;
   if (Z_OK == inflateInit2 (&strm, 15 + 32))
-    {
-      strm.next_out = (Bytef *) buf;
-      strm.avail_out = bufSize;
-      inflate (&strm, Z_FINISH);
-      if (strm.total_out > 0)
-        ret = processControlTar (buf, strm.total_out,
-                                 ec->proc, ec->cls);
-      inflateEnd (&strm);
-    }
+  {
+    strm.next_out = (Bytef *) buf;
+    strm.avail_out = bufSize;
+    inflate (&strm, Z_FINISH);
+    if (strm.total_out > 0)
+      ret = processControlTar (buf, strm.total_out,
+                               ec->proc, ec->cls);
+    inflateEnd (&strm);
+  }
   free (buf);
   free (cdata);
   return ret;
@@ -481,49 +482,50 @@ EXTRACTOR_deb_extract_method (struct EXTRACTOR_ExtractContext *ec)
     return;
   pos = 8;
   while (pos + sizeof (struct ObjectHeader) < fsize)
+  {
+    if (pos !=
+        ec->seek (ec->cls, pos, SEEK_SET))
+      return;
+    if (sizeof (struct ObjectHeader) !=
+        ec->read (ec->cls, &data, sizeof (struct ObjectHeader)))
+      return;
+    hdr = data;
+    if (0 != strncmp (&hdr->trailer[0], "`\n", 2))
+      return;
+    memcpy (buf, &hdr->filesize[0], 10);
+    buf[10] = '\0';
+    if (1 != sscanf (buf, "%10llu", &csize))
+      return;
+    pos += sizeof (struct ObjectHeader);
+    if ((pos + csize > fsize) || (csize > fsize) || (pos + csize < pos))
+      return;
+    if (0 == strncmp (&hdr->name[0],
+                      "control.tar.gz",
+                      strlen ("control.tar.gz")))
     {
-      if (pos !=
-          ec->seek (ec->cls, pos, SEEK_SET))
-        return;
-      if (sizeof (struct ObjectHeader) !=
-          ec->read (ec->cls, &data, sizeof (struct ObjectHeader)))
-        return;
-      hdr = data;
-      if (0 != strncmp (&hdr->trailer[0], "`\n", 2))
+      if (0 != processControlTGZ (ec,
+                                  csize))
         return;
-      memcpy (buf, &hdr->filesize[0], 10);
-      buf[10] = '\0';
-      if (1 != sscanf (buf, "%10llu", &csize))
-        return;
-      pos += sizeof (struct ObjectHeader);
-      if ((pos + csize > fsize) || (csize > fsize) || (pos + csize < pos))
+      done++;
+    }
+    if (0 == strncmp (&hdr->name[0],
+                      "debian-binary", strlen ("debian-binary")))
+    {
+      if (0 != ec->proc (ec->cls,
+                         "deb",
+                         EXTRACTOR_METATYPE_MIMETYPE,
+                         EXTRACTOR_METAFORMAT_UTF8,
+                         "text/plain",
+                         "application/x-debian-package",
+                         strlen ("application/x-debian-package") + 1))
         return;
-      if (0 == strncmp (&hdr->name[0],
-                        "control.tar.gz",
-                        strlen ("control.tar.gz")))
-        {
-          if (0 != processControlTGZ (ec,
-                                      csize))
-            return;
-          done++;
-        }
-      if (0 == strncmp (&hdr->name[0],
-                        "debian-binary", strlen ("debian-binary")))
-        {
-          if (0 != ec->proc (ec->cls,
-                             "deb",
-                             EXTRACTOR_METATYPE_MIMETYPE,
-                             EXTRACTOR_METAFORMAT_UTF8,
-                             "text/plain",
-                             "application/x-debian-package",
-                             strlen ("application/x-debian-package")+1))
-            return;
-          done++;
-        }
-      pos += csize;
-      if (2 == done)
-        break;                  /* no need to process the rest of the archive */
+      done++;
     }
+    pos += csize;
+    if (2 == done)
+      break;                    /* no need to process the rest of the archive */
+  }
 }
 
+
 /* end of deb_extractor.c */