allow blank options; fixes msoulier#141

9001 · 9001 · commit 8e52f3d890ce · 2024-06-14T21:01:51.000+02:00
diff --git a/partftpy/TftpPacketTypes.py b/partftpy/TftpPacketTypes.py
@@ -46,7 +46,6 @@ def decode_options(self, buffer):
         words.pop()
 
         tftpassert(len(words) % 2 == 0, "packet has odd number of option/value pairs")
-        tftpassert("" not in words, "packet has zerolength option values")
 
         options = {k: v for k, v in zip(words[::2], words[1::2])}
         for k in ("blksize", "tsize"):
diff --git a/partftpy/TftpStates.py b/partftpy/TftpStates.py
@@ -64,8 +64,10 @@ def returnSupportedOptions(self, options):
         # We support the options blksize and tsize right now.
         # FIXME - put this somewhere else?
         accepted_options = {}
-        for option in options:
-            if option == "blksize":
+        for option, optval in options.items():
+            if optval == "":
+                log.info("Option ignored due to blank value: '%s'", option)
+            elif option == "blksize":
                 # Make sure it's valid.
                 if int(options[option]) > MAX_BLKSIZE:
                     log.info(
