<!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; } </style> </head> <body> <div class="content"> <h3> PulseAudio Marge Bot pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio">PulseAudio / pulseaudio</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/65889fbdee15c7a664670540f59e8f3c5c20c640">65889fbd</a> <div> by Georg Chini at 2022-05-26T16:41:21+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">zeroconf-publish: Fix crash when avahi_client_new() fails When the module is loaded and avahi_client_new() fails because the client cannot connect, a shutdown of the module is scheduled. In parallel, the client_callback is called with AVAHI_ERR_DISCONNECTED and another connection attempt is made which also fails and triggers a second unload of the module. This crashes PA, because there is already an unload in progress. This patch fixes the problem by checking if an unload is already scheduled. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/710> </pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#aed7da210f3b8eefc069c8574e433110a93dac6a"> src/modules/module-zeroconf-publish.c </a> </li> </ul> <h4>Changes:</h4> <li id="aed7da210f3b8eefc069c8574e433110a93dac6a"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/65889fbdee15c7a664670540f59e8f3c5c20c640#aed7da210f3b8eefc069c8574e433110a93dac6a">src/modules/module-zeroconf-publish.c</a> <hr> <table class="code white" style="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="645" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="645" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -645,7 +645,7 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs</td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="645" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 645 </td> <td class="new_line diff-line-num" data-linenumber="645" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 645 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="646" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 646 </td> <td class="new_line diff-line-num" data-linenumber="646" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 646 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> pa_assert(u); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="647" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 647 </td> <td class="new_line diff-line-num" data-linenumber="647" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 647 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> </pre></td> </tr> <tr class="line_holder old" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="648" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 648 </td> <td class="new_line diff-line-num old" data-linenumber="648" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"><pre style="margin: 0;">- if (u->shutting_down) </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="649" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="648" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 648 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"><pre style="margin: 0;">+ if (u->shutting_down || u->module->unload_requested) </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="649" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 649 </td> <td class="new_line diff-line-num" data-linenumber="649" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 649 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> return 0; </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="650" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 650 </td> <td class="new_line diff-line-num" data-linenumber="650" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 650 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="651" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 651 </td> <td class="new_line diff-line-num" data-linenumber="651" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 651 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> switch (code) { </pre></td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/65889fbdee15c7a664670540f59e8f3c5c20c640">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/65889fbdee15c7a664670540f59e8f3c5c20c640"}}</script> </div> </body> </html>