Mercurial > octave
changeset 31941:9cd7515e735d
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 28 Mar 2023 16:04:43 +0200 |
parents | 8e82a7fc21aa (current diff) 7faaf2c6aaec (diff) |
children | c90de146a9ed |
files | liboctave/util/url-transfer.cc |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc Mon Mar 27 13:04:48 2023 -0400 +++ b/liboctave/util/url-transfer.cc Tue Mar 28 16:04:43 2023 +0200 @@ -535,7 +535,12 @@ if (newpos == std::string::npos) break; - retval(i) = str.substr(pos, newpos - pos); + std::string name = str.substr (pos, newpos - pos); + // remove trailing \r if there is one + if (name.length () > 0 && name.back () == '\r') + name.pop_back (); + + retval(i) = name; pos = newpos + 1; }