am 6e72cad9: (-s ours) am 49d1087f: am 6fe78a87: am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once again

* commit '6e72cad9ead9e12d73e635a70ffe93d52f6f7a8d':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again