← Back to branch summary

~ps-jenkins/mediascanner2/trusty-proposed

« back to all changes in this revision

Viewing changes to src/daemon/Scanner.cc

  • Committer: CI bot
  • Author(s): Jussi Pakkanen
  • Date: 2014-04-03 09:59:47 UTC
  • mfrom: (220.2.1 mediascanner)
  • Revision ID: ps-jenkins@lists.canonical.com-20140403095947-pagctldfygwqdc8l
Avoid assert crash by not trying to unregister subvolumes that were skipped due to looking like root subdirs. Fixes: 1294193

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/daemon/Scanner.cc
45
45
        return result;
46
46
    }
47
47
    if(is_rootlike(root)) {
48
 
        fprintf(stderr, "Directory %s looks like a top level root directory, skipping it.\n",
49
 
                root.c_str());
 
48
        fprintf(stderr, "Directory %s looks like a top level root directory, skipping it (%s).\n",
 
49
                root.c_str(), __PRETTY_FUNCTION__);
50
50
        return result;
51
51
    }
52
52
    unique_ptr<struct dirent, void(*)(void*)> entry((dirent*)malloc(sizeof(dirent) + NAME_MAX),