From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 17:09:49 +0000 (+0100)
Subject: Thu Mar 22 13:18:06 GMT 2012  Peter Le Bek <peter@hyperplex.net>
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/-?a=commitdiff_plain;h=8b27511c0e1e9e920ca3ea33d5aff2ec818496ea;p=tahoe-lafs%2Ftahoe-lafs.git

Thu Mar 22 13:18:06 GMT 2012  Peter Le Bek <peter@hyperplex.net>
  * ftpd file `size' attribute must be an integer
---

diff --git a/src/allmydata/frontends/ftpd.py b/src/allmydata/frontends/ftpd.py
index cc2a0a08..fde72d7f 100644
--- a/src/allmydata/frontends/ftpd.py
+++ b/src/allmydata/frontends/ftpd.py
@@ -193,7 +193,7 @@ class Handler:
                 if isdir:
                     value = 0
                 else:
-                    value = childnode.get_size()
+                    value = childnode.get_size() or 0
             elif key == "directory":
                 value = isdir
             elif key == "permissions":