Changeset 72568 in vbox

Timestamp:

Jun 15, 2018 3:18:34 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123062

Message:

scm: Use RTMemDupEx in scmCfgEntryDup so we don't read beyond the end of static rewriter configs.

File:

• trunk/src/bldprogs/scm.cpp (modified) (1 diff)

trunk/src/bldprogs/scm.cpp

@@ -786 +786 @@
         if (pDup)
         {
-            size_t    cbRewriters = sizeof(pEntry->paRewriters[0]) * RT_ALIGN_Z(pEntry->cRewriters, 8);
-            pDup->paRewriters = (PCSCMREWRITERCFG const *)RTMemDup(pEntry->paRewriters, cbRewriters);
+            size_t cbSrcRewriters = sizeof(pEntry->paRewriters[0]) * pEntry->cRewriters;
+            size_t cbDstRewriters = sizeof(pEntry->paRewriters[0]) * RT_ALIGN_Z(pEntry->cRewriters, 8);
+            pDup->paRewriters = (PCSCMREWRITERCFG const *)RTMemDupEx(pEntry->paRewriters, cbSrcRewriters,
+                                                                     cbDstRewriters - cbSrcRewriters);
             if (pDup->paRewriters)
                 return pDup;