diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc
index 2b5c7e5..2c3be4c 100644
--- a/poppler/FontInfo.cc
+++ b/poppler/FontInfo.cc
@@ -131,10 +131,10 @@
     Object objDict = resDict->lookup(resTypes[resType]);
     if (objDict.isDict()) {
       for (int i = 0; i < objDict.dictGetLength(); ++i) {
-        const Object &resObj = objDict.dictGetValNF(i);
-        if (resObj.isRef()) {
+        const Object &dictObjI = objDict.dictGetValNF(i);
+        if (dictObjI.isRef()) {
           // check for an already-seen object
-          const Ref r = resObj.getRef();
+          const Ref r = dictObjI.getRef();
           if (visitedObjects.find(r.num) != visitedObjects.end()) {
             continue;
           }
@@ -142,7 +142,7 @@
           visitedObjects.insert(r.num);
         }
 
-        Object obj2 = resObj.fetch(xrefA);
+        Object obj2 = dictObjI.fetch(xrefA);
         if (obj2.isStream()) {
           Object resObj = obj2.streamGetDict()->lookup("Resources");
           if (resObj.isDict() && resObj.getDict() != resDict) {
