From 52d602335be1826e6a99a6470c03062ba908d373 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 2 Aug 2011 16:07:43 +1000 Subject: s4-libcli: Check if short_name is not null, before converting to python string Signed-off-by: Andrew Bartlett --- source4/libcli/pysmb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source4/libcli/pysmb.c b/source4/libcli/pysmb.c index ccd765634a..43478ea5a8 100644 --- a/source4/libcli/pysmb.c +++ b/source4/libcli/pysmb.c @@ -165,7 +165,14 @@ static void py_smb_list_callback(struct clilist_file_info *f, const char *mask, dict = PyDict_New(); if(dict) { PyDict_SetItemString(dict, "name", PyString_FromString(f->name)); - PyDict_SetItemString(dict, "short_name", PyString_FromString(f->short_name)); + + /* Windows does not always return short_name */ + if (f->short_name) { + PyDict_SetItemString(dict, "short_name", PyString_FromString(f->short_name)); + } else { + PyDict_SetItemString(dict, "short_name", Py_None); + } + PyDict_SetItemString(dict, "size", PyLong_FromUnsignedLongLong(f->size)); PyDict_SetItemString(dict, "attrib", PyInt_FromLong(f->attrib)); PyDict_SetItemString(dict, "mtime", PyInt_FromLong(f->mtime)); -- cgit