swrun_*: Restore buffer overflow prevention code that was removed in da00ba1
swrun_*: Simplify commit da00ba1
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  swrun_*: Simplify commit da00ba1
  swrun_*: Restore buffer overflow prevention code that was removed in da00ba1