[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] stream-restore: make version check stricter when dropping old entries

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
13fd21a9 by Tanu Kaskinen at 2021-07-09T12:32:27+03:00
stream-restore: make version check stricter when dropping old entries

If we increment ENTRY_VERSION in the future, the old code would drop
entries with version 2, but we only want to drop entries with version 1.

This issue was spotted by Igor Kovalenko:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/298#note_983365

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/604>

- - - - -


1 changed file:

- src/modules/module-stream-restore.c


Changes:

=====================================
src/modules/module-stream-restore.c
=====================================
@@ -1175,7 +1175,7 @@ static struct entry *entry_read(struct userdata *u, const char *name) {
     pa_datum_free(&data);
 
 #ifdef STREAM_RESTORE_CLEAR_OLD_DEVICES
-    if (version < ENTRY_VERSION && e->device_valid) {
+    if (version < 2 && e->device_valid) {
         /* Prior to PulseAudio 14.0, GNOME's sound settings overwrote the
          * routing for all entries in the stream-restore database when
          * selecting a device. PulseAudio 14.0 prevents that from happening,



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/13fd21a9c9a80aab0ea8fae99d54d9a4ee75c188

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/13fd21a9c9a80aab0ea8fae99d54d9a4ee75c188
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20210709/c0c70f44/attachment.htm>