From a0f59e04b299e67e700f6cc491aab45472814a2c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 8 Oct 2018 02:46:26 +0200
Subject: dpkg-split: Use nfstrnsave() instead of nfmalloc() + memcpy()

---
 dpkg-split/queue.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'dpkg-split')

diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 8ea2a30b4..1ef083ea5 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -62,23 +62,25 @@ decompose_filename(const char *filename, struct partqueue *pq)
   if (strspn(filename, "0123456789abcdef") != MD5HASHLEN ||
       filename[MD5HASHLEN] != '.')
     return false;
-  q = nfmalloc(MD5HASHLEN + 1);
-  memcpy(q, filename, MD5HASHLEN);
-  q[MD5HASHLEN] = '\0';
-  pq->info.md5sum= q;
+
+  pq->info.md5sum = nfstrnsave(filename, MD5HASHLEN);
+
   p = filename + MD5HASHLEN + 1;
   errno = 0;
   pq->info.maxpartlen = strtoimax(p, &q, 16);
   if (q == p || *q++ != '.' || errno != 0)
     return false;
+
   p = q;
   pq->info.thispartn = (int)strtol(p, &q, 16);
   if (q == p || *q++ != '.' || errno != 0)
     return false;
+
   p = q;
   pq->info.maxpartn = (int)strtol(p, &q, 16);
   if (q == p || *q || errno != 0)
     return false;
+
   return true;
 }
 
-- 
cgit v1.2.3