Congrats on realising that your code is vulnerable, that alone is already a huge accomplishment. Not many people realise that.
There is no general solution except for ‘fix it’. In your case, @senior.joinu already explained very nicely how to fix in your case.
If you want an example of how I do exactly that in the cycles faucet, have a look at this post, which explains the process in a lot of detail.