Peter M. Groen / oletools

Commit 689317a242fd035f1f6a0991a9c29b1f9bcf8538

Authored by Christian Herdtweck
1 parent 5fec64f9

pylint-ify 3: pseudo-use unused variables in _extract_vba

Inline Side-by-side
Showing 1 changed file with 45 additions and 0 deletions
oletools/olevba.py
  View file @689317a
... ... @@ -1222,6 +1222,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1222 1222 if projectname_sizeof_projectname < 1 or projectname_sizeof_projectname > 128:
1223 1223 log.error("PROJECTNAME_SizeOfProjectName value not in range: {0}".format(projectname_sizeof_projectname))
1224 1224 projectname_projectname = dir_stream.read(projectname_sizeof_projectname)
  1225 + unused = projectname_projectname
1225 1226  
1226 1227 # PROJECTDOCSTRING Record
1227 1228 projectdocstring_id = struct.unpack("<H", dir_stream.read(2))[0]
... ... @@ -1237,6 +1238,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1237 1238 if projectdocstring_sizeof_docstring_unicode % 2 != 0:
1238 1239 log.error("PROJECTDOCSTRING_SizeOfDocStringUnicode is not even")
1239 1240 projectdocstring_docstring_unicode = dir_stream.read(projectdocstring_sizeof_docstring_unicode)
  1241 + unused = projectdocstring_docstring
  1242 + unused = projectdocstring_docstring_unicode
1240 1243  
1241 1244 # PROJECTHELPFILEPATH Record - MS-OVBA 2.3.4.2.1.7
1242 1245 projecthelpfilepath_id = struct.unpack("<H", dir_stream.read(2))[0]
... ... @@ -1261,6 +1264,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1261 1264 projecthelpcontext_size = struct.unpack("<L", dir_stream.read(4))[0]
1262 1265 check_value('PROJECTHELPCONTEXT_Size', 0x0004, projecthelpcontext_size)
1263 1266 projecthelpcontext_helpcontext = struct.unpack("<L", dir_stream.read(4))[0]
  1267 + unused = projecthelpcontext_helpcontext
1264 1268  
1265 1269 # PROJECTLIBFLAGS Record
1266 1270 projectlibflags_id = struct.unpack("<H", dir_stream.read(2))[0]
... ... @@ -1277,6 +1281,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1277 1281 check_value('PROJECTVERSION_Reserved', 0x0004, projectversion_reserved)
1278 1282 projectversion_versionmajor = struct.unpack("<L", dir_stream.read(4))[0]
1279 1283 projectversion_versionminor = struct.unpack("<H", dir_stream.read(2))[0]
  1284 + unused = projectversion_versionmajor
  1285 + unused = projectversion_versionminor
1280 1286  
1281 1287 # PROJECTCONSTANTS Record
1282 1288 projectconstants_id = struct.unpack("<H", dir_stream.read(2))[0]
... ... @@ -1292,6 +1298,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1292 1298 if projectconstants_sizeof_constants_unicode % 2 != 0:
1293 1299 log.error("PROJECTCONSTANTS_SizeOfConstantsUnicode is not even")
1294 1300 projectconstants_constants_unicode = dir_stream.read(projectconstants_sizeof_constants_unicode)
  1301 + unused = projectconstants_constants
  1302 + unused = projectconstants_constants_unicode
1295 1303  
1296 1304 # array of REFERENCE records
1297 1305 check = None
... ... @@ -1310,6 +1318,9 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1310 1318 check_value('REFERENCE_Reserved', 0x003E, reference_reserved)
1311 1319 reference_sizeof_name_unicode = struct.unpack("<L", dir_stream.read(4))[0]
1312 1320 reference_name_unicode = dir_stream.read(reference_sizeof_name_unicode)
  1321 + unused = reference_id
  1322 + unused = reference_name
  1323 + unused = reference_name_unicode
1313 1324 continue
1314 1325  
1315 1326 if check == 0x0033:
... ... @@ -1317,6 +1328,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1317 1328 referenceoriginal_id = check
1318 1329 referenceoriginal_sizeof_libidoriginal = struct.unpack("<L", dir_stream.read(4))[0]
1319 1330 referenceoriginal_libidoriginal = dir_stream.read(referenceoriginal_sizeof_libidoriginal)
  1331 + unused = referenceoriginal_id
  1332 + unused = referenceoriginal_libidoriginal
1320 1333 continue
1321 1334  
1322 1335 if check == 0x002F:
... ... @@ -1329,6 +1342,9 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1329 1342 check_value('REFERENCECONTROL_Reserved1', 0x0000, referencecontrol_reserved1)
1330 1343 referencecontrol_reserved2 = struct.unpack("<H", dir_stream.read(2))[0] # ignore
1331 1344 check_value('REFERENCECONTROL_Reserved2', 0x0000, referencecontrol_reserved2)
  1345 + unused = referencecontrol_id
  1346 + unused = referencecontrol_sizetwiddled
  1347 + unused = referencecontrol_libidtwiddled
1332 1348 # optional field
1333 1349 check2 = struct.unpack("<H", dir_stream.read(2))[0]
1334 1350 if check2 == 0x0016:
... ... @@ -1343,6 +1359,9 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1343 1359 referencecontrol_namerecordextended_name_unicode = dir_stream.read(
1344 1360 referencecontrol_namerecordextended_sizeof_name_unicode)
1345 1361 referencecontrol_reserved3 = struct.unpack("<H", dir_stream.read(2))[0]
  1362 + unused = referencecontrol_namerecordextended_id
  1363 + unused = referencecontrol_namerecordextended_name
  1364 + unused = referencecontrol_namerecordextended_name_unicode
1346 1365 else:
1347 1366 referencecontrol_reserved3 = check2
1348 1367  
... ... @@ -1354,6 +1373,12 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1354 1373 referencecontrol_reserved5 = struct.unpack("<H", dir_stream.read(2))[0]
1355 1374 referencecontrol_originaltypelib = dir_stream.read(16)
1356 1375 referencecontrol_cookie = struct.unpack("<L", dir_stream.read(4))[0]
  1376 + unused = referencecontrol_sizeextended
  1377 + unused = referencecontrol_libidextended
  1378 + unused = referencecontrol_reserved4
  1379 + unused = referencecontrol_reserved5
  1380 + unused = referencecontrol_originaltypelib
  1381 + unused = referencecontrol_cookie
1357 1382 continue
1358 1383  
1359 1384 if check == 0x000D:
... ... @@ -1366,6 +1391,9 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1366 1391 check_value('REFERENCEREGISTERED_Reserved1', 0x0000, referenceregistered_reserved1)
1367 1392 referenceregistered_reserved2 = struct.unpack("<H", dir_stream.read(2))[0]
1368 1393 check_value('REFERENCEREGISTERED_Reserved2', 0x0000, referenceregistered_reserved2)
  1394 + unused = referenceregistered_id
  1395 + unused = referenceregistered_size
  1396 + unused = referenceregistered_libid
1369 1397 continue
1370 1398  
1371 1399 if check == 0x000E:
... ... @@ -1378,6 +1406,12 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1378 1406 referenceproject_libidrelative = dir_stream.read(referenceproject_sizeof_libidrelative)
1379 1407 referenceproject_majorversion = struct.unpack("<L", dir_stream.read(4))[0]
1380 1408 referenceproject_minorversion = struct.unpack("<H", dir_stream.read(2))[0]
  1409 + unused = referenceproject_id
  1410 + unused = referenceproject_size
  1411 + unused = referenceproject_libidabsolute
  1412 + unused = referenceproject_libidrelative
  1413 + unused = referenceproject_majorversion
  1414 + unused = referenceproject_minorversion
1381 1415 continue
1382 1416  
1383 1417 log.error('invalid or unknown check Id {0:04X}'.format(check))
... ... @@ -1393,6 +1427,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1393 1427 projectmodules_projectcookierecord_size = struct.unpack("<L", dir_stream.read(4))[0]
1394 1428 check_value('PROJECTMODULES_ProjectCookieRecord_Size', 0x0002, projectmodules_projectcookierecord_size)
1395 1429 projectmodules_projectcookierecord_cookie = struct.unpack("<H", dir_stream.read(2))[0]
  1430 + unused = projectmodules_projectcookierecord_cookie
1396 1431  
1397 1432 log.debug("parsing {0} modules".format(projectmodules_count))
1398 1433 for x in xrange(0, projectmodules_count):
... ... @@ -1406,6 +1441,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1406 1441 modulename_unicode_id = section_id
1407 1442 modulename_unicode_sizeof_modulename_unicode = struct.unpack("<L", dir_stream.read(4))[0]
1408 1443 modulename_unicode_modulename_unicode = dir_stream.read(modulename_unicode_sizeof_modulename_unicode)
  1444 + unused = modulename_unicode_id
  1445 + unused = modulename_unicode_modulename_unicode
1409 1446 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1410 1447 if section_id == 0x001A:
1411 1448 modulestreamname_id = section_id
... ... @@ -1415,6 +1452,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1415 1452 check_value('MODULESTREAMNAME_Reserved', 0x0032, modulestreamname_reserved)
1416 1453 modulestreamname_sizeof_streamname_unicode = struct.unpack("<L", dir_stream.read(4))[0]
1417 1454 modulestreamname_streamname_unicode = dir_stream.read(modulestreamname_sizeof_streamname_unicode)
  1455 + unused = modulestreamname_id
  1456 + unused = modulestreamname_streamname_unicode
1418 1457 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1419 1458 if section_id == 0x001C:
1420 1459 moduledocstring_id = section_id
... ... @@ -1425,6 +1464,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1425 1464 check_value('MODULEDOCSTRING_Reserved', 0x0048, moduledocstring_reserved)
1426 1465 moduledocstring_sizeof_docstring_unicode = struct.unpack("<L", dir_stream.read(4))[0]
1427 1466 moduledocstring_docstring_unicode = dir_stream.read(moduledocstring_sizeof_docstring_unicode)
  1467 + unused = moduledocstring_docstring
  1468 + unused = moduledocstring_docstring_unicode
1428 1469 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1429 1470 if section_id == 0x0031:
1430 1471 moduleoffset_id = section_id
... ... @@ -1439,6 +1480,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1439 1480 modulehelpcontext_size = struct.unpack("<L", dir_stream.read(4))[0]
1440 1481 check_value('MODULEHELPCONTEXT_Size', 0x0004, modulehelpcontext_size)
1441 1482 modulehelpcontext_helpcontext = struct.unpack("<L", dir_stream.read(4))[0]
  1483 + unused = modulehelpcontext_helpcontext
1442 1484 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1443 1485 if section_id == 0x002C:
1444 1486 modulecookie_id = section_id
... ... @@ -1446,10 +1488,13 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1446 1488 modulecookie_size = struct.unpack("<L", dir_stream.read(4))[0]
1447 1489 check_value('MODULECOOKIE_Size', 0x0002, modulecookie_size)
1448 1490 modulecookie_cookie = struct.unpack("<H", dir_stream.read(2))[0]
  1491 + unused = modulecookie_cookie
1449 1492 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1450 1493 if section_id == 0x0021 or section_id == 0x0022:
1451 1494 moduletype_id = section_id
1452 1495 moduletype_reserved = struct.unpack("<L", dir_stream.read(4))[0]
  1496 + unused = moduletype_id
  1497 + unused = moduletype_reserved
1453 1498 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1454 1499 if section_id == 0x0025:
1455 1500 modulereadonly_id = section_id
... ...