@sir I'm all for contributing fixes upstream, but there's one catch that means you may still need a workaround anyway:
if the upstream is slower to make new releases than you are, or if you care about people running nowhere-near-bleeding-edge distros like Debian Stable, it may turn out that the code you're working on gets to run with an older version of the upstream library that doesn't have the fix yet.