Skip to content
Snippets Groups Projects

MediaLibrary: Set logger before acquiring file lock

Merged Alaric Senat requested to merge asenat/medialibrary:fix/lock-file-crash into master
All threads resolved!

File locking will attempt to log on failure (ie: the medialib is already locked). As fc002ae1 removed s_logger null checking, logging before constructing MediaLibrary dereferences nullptr.

Merge request reports

Merge request pipeline #232134 passed

Merge request pipeline passed for 974fe366

Approved by

Merged by Hugo Beauzée-LuyssenHugo Beauzée-Luyssen 2 years ago (Jun 17, 2022 9:34am UTC)

Merge details

  • Changes merged into master with 974fe366.
  • Deleted the source branch.

Pipeline #233107 failed

Pipeline failed for 974fe366 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • You'll need to do the same kind of change (or use the NewMediaLibrary factory) from the tests programs as well (see test/meson.build for the list of the test programs)

  • Alaric Senat added 2 commits

    added 2 commits

    • 98706459 - tests: Set logger globally in all test cases
    • 4bc6c06c - MediaLibrary: Set logger before acquiring file lock

    Compare with previous version

  • Hugo Beauzée-Luyssen
  • Hugo Beauzée-Luyssen
  • nit: your first commit references its own MR, that's a bit strange IMO

  • Alaric Senat added 2 commits

    added 2 commits

    • f1386e0b - tests: Set logger globally in all test cases
    • 3e54bf76 - MediaLibrary: Set logger before acquiring file lock

    Compare with previous version

  • added 30 commits

    • 3e54bf76...5a3fa473 - 28 commits from branch videolan:master
    • c04a18f9 - tests: Set logger globally in all test cases
    • 974fe366 - MediaLibrary: Set logger before acquiring file lock

    Compare with previous version

  • Alaric Senat resolved all threads

    resolved all threads

  • Hugo Beauzée-Luyssen approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading