<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } body { font-size: 0.875rem; } body { -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; } body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: inherit; } </style> </head> <body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";'> <div class="content"> <h3 style="margin-top: 20px; margin-bottom: 10px;"> PulseAudio Marge Bot pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" style="color: #1068bf; text-decoration: none;">PulseAudio / pulseaudio</a> </h3> <h4 style="margin-top: 10px; margin-bottom: 10px;"> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/4bdf4c99662f3da0e58d6c04bafff95d84362922" style="color: #1068bf; text-decoration: none;">4bdf4c99</a> <div> by Takashi Sakamoto at 2022-06-27T22:08:13+03:00 </div> <pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>alsa-mixer: avoid assertion at alsa-lib mixer API when element removal PulseAudio v5.99 or later hits assertion at alsa-lib mixer API due to wrong handling of removal event for mixer element. pulseaudio: mixer.c:149: hctl_elem_event_handler: Assertion `bag_empty(bag)' failed. The removal event is defined as '~0U', thus it's not distinguished from the other type of event just by bitwise operator. At the removal event, class implementator for mixer API should detach mixer element from hcontrol element in callback handler since alsa-lib has assertion to check the list of mixer elements for a hcontrol element is empty or not after calling all of handlers. In detail, please refer to MR to alsa-lib: * https://github.com/alsa-project/alsa-lib/pull/244 This commit fixes the above two issues. The issue can be regenerated by `samples/ctl` Python 3 script of alsa-gobject. * https://github.com/alsa-project/alsa-gobject/ It adds some user-defined elements into sound card 0. When terminated by SIGINT signal, it removes the elements. Then PulseAudio dies due to the assertion. Fixes: 1fd8848e64cf ("alsa-util: Add functions for accessing mixer elements through mixer class") Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/728> </pre> </li> </ul> <h4 style="margin-top: 10px; margin-bottom: 10px;">1 changed file:</h4> <ul> <li class="file-stats"> <a href="#3ac06ce22ce83ead012b5ee8edbdadc1e0bfa5cb" style="color: #1068bf; text-decoration: none;"> src/modules/alsa/alsa-util.c </a> </li> </ul> <h4 style="margin-top: 10px; margin-bottom: 10px;">Changes:</h4> <li id="3ac06ce22ce83ead012b5ee8edbdadc1e0bfa5cb"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/4bdf4c99662f3da0e58d6c04bafff95d84362922#3ac06ce22ce83ead012b5ee8edbdadc1e0bfa5cb" style="color: #1068bf; text-decoration: none;">src/modules/alsa/alsa-util.c</a> <hr style="overflow: hidden; border: 1px solid #e1e1e1;"> <table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="1654" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="1654" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="color: rgba(0,0,0,0.3); padding: inherit;" bgcolor="#fafafa">@@ -1654,7 +1654,13 @@ static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,</td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1654" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1654 </td> <td class="new_line diff-line-num" data-linenumber="1654" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1654 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> { </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1655" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1655 </td> <td class="new_line diff-line-num" data-linenumber="1655" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1655 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> int err; </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1656" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1656 </td> <td class="new_line diff-line-num" data-linenumber="1656" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1656 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> const char *name = snd_hctl_elem_get_name(helem); </pre></td> </tr> <tr class="line_holder old" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="1657" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 1657 </td> <td class="new_line diff-line-num old" data-linenumber="1657" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>- if (mask & SND_CTL_EVENT_MASK_ADD) { </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1657" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1657 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ /* NOTE: The remove event is defined as '~0U`. */ </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1658 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ if (mask == SND_CTL_EVENT_MASK_REMOVE) { </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1659" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1659 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ /* NOTE: Unless we remove the pointer to melem from the linked-list at </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1660" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1660 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ * private_data of helem, an assertion will be hit in alsa-lib since </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1661" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1661 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ * the list is not empty. */ </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1662" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1662 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ snd_mixer_elem_detach(melem, helem); </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1663" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1663 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ } else if (mask & SND_CTL_EVENT_MASK_ADD) { </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1658" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1658 </td> <td class="new_line diff-line-num" data-linenumber="1664" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1664 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1659" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1659 </td> <td class="new_line diff-line-num" data-linenumber="1665" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1665 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) { </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1660" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1660 </td> <td class="new_line diff-line-num" data-linenumber="1666" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 1666 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> snd_mixer_elem_t *new_melem; </pre></td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/4bdf4c99662f3da0e58d6c04bafff95d84362922" style="color: #1068bf; text-decoration: none;">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/4bdf4c99662f3da0e58d6c04bafff95d84362922"}}</script> </div> </body> </html>