diff --git a/configure.py b/configure.py
index d5e19ed9..38b302df 100644
--- a/configure.py
+++ b/configure.py
@@ -304,7 +304,7 @@ config.libs = [
             Object(Matching, "f/f_list.cpp"),
             Object(Matching, "f/f_manager.cpp"),
             Object(Matching, "m/m_angle.cpp"),
-            Object(NonMatching, "m/m_dvd.cpp"),
+            Object(Matching, "m/m_dvd.cpp"),
             Object(Matching, "m/m_heap.cpp"),
             Object(NonMatching, "m/m_mtx.cpp"),
             Object(Matching, "DynamicLink.cpp"),
diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp
index a4c9ff04..c503216b 100644
--- a/src/m/m_dvd.cpp
+++ b/src/m/m_dvd.cpp
@@ -374,11 +374,11 @@ mDvd_mountMemArchive_c::mDvd_mountMemArchive_c(int mountDirection) {
 
 /** 802ef7c0 */
 int findPathWithCompressedExtension(const char *name, u8 *outType) {
-    // TODO regshuffle
     u8 type;
-    int num;
     char buf[256];
-    mDvd::TUncompressInfo_Base_c **ptr;
+    int num;
+    char *end;
+    int size;
 
     type = 0;
     buf[255] = '\0';
@@ -386,10 +386,11 @@ int findPathWithCompressedExtension(const char *name, u8 *outType) {
 
     strncpy(buf, name, sizeof(buf));
     if (buf[255] == '\0') {
-        char *end = buf + strlen(buf);
+        end = buf + strlen(buf);
+        size = sizeof(buf) - (end - buf);
         // Append the compressor extension and try to find a compressed version
-        for (ptr = mDvd::compressors_ptr; ptr != mDvd::compressors_last; ptr++) {
-            strncpy(end, (*ptr)->mExtension, sizeof(buf) - (end - buf));
+        for (mDvd::TUncompressInfo_Base_c **ptr = mDvd::compressors_ptr; ptr != mDvd::compressors_last; ptr++) {
+            strncpy(end, (*ptr)->mExtension, size);
             num = DVDConvertPathToEntrynum(buf);
             if (num != -1) {
                 type = (*ptr)->mType;
@@ -404,9 +405,10 @@ int findPathWithCompressedExtension(const char *name, u8 *outType) {
         }
         end = strrchr(end, '.');
         if (end != nullptr) {
+            size = sizeof(buf) - (end - buf);
             // Append the compressor extension and try to find a compressed version
-            for (ptr = mDvd::compressors_ptr; ptr != mDvd::compressors_last; ptr++) {
-                strncpy(end, (*ptr)->mExtension, sizeof(buf) - (end - buf));
+            for (mDvd::TUncompressInfo_Base_c **ptr = mDvd::compressors_ptr; ptr != mDvd::compressors_last; ptr++) {
+                strncpy(end, (*ptr)->mExtension, size);
                 num = DVDConvertPathToEntrynum(buf);
                 if (num != -1) {
                     type = (*ptr)->mType;