[Libreoffice-commits] online.git: wsd/Storage.hpp
wsd/Storage.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff1e14a1d04237911b1d6b16b6499247e901adc1
Author: Michael Meeks
AuthorDate: Mon Jun 8 16:54:04 2020 +0100
Commit: Michael Meeks
CommitDate: Mon Jun 8 17:56:27 2020 +0200
WaE: fix 'isAutosave' shadows a member of 'this'
Change-Id: I30fec0e39085f6e4f7049bb690390606d2d1ef15
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95845
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index e7fa612b9..84d77a41b 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -202,7 +202,7 @@ public:
bool isUserModified() const { return _isUserModified; }
/// To be able to set the WOPI 'is autosave/is exitsave?' headers
appropriately.
-void setIsAutosave(bool isAutosave) { _isAutosave = isAutosave; }
+void setIsAutosave(bool newIsAutosave) { _isAutosave = newIsAutosave; }
bool isAutosave() const { return _isAutosave; }
void setIsExitSave(bool exitSave) { _isExitSave = exitSave; }
bool isExitSave() const { return _isExitSave; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/Storage.hpp
wsd/Storage.hpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 532ae61caf92e8b6b477fd5d09c2da90621a7593
Author: Miklos Vajna
AuthorDate: Wed Aug 21 09:06:44 2019 +0200
Commit: Miklos Vajna
CommitDate: Wed Aug 21 09:06:50 2019 +0200
Fix UB in StorageBase::isExitSave()
StorageBase::_isExitSave was uninitialized:
wsd/Storage.hpp:181:38: runtime error: load of value 190, which is not a
valid value for type 'bool'
#0 0xd02260 in StorageBase::isExitSave() const
/home/vmiklos/git/libreoffice/online-san/./wsd/Storage.hpp:181:38
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior
wsd/Storage.hpp:181:38 in
Seen during unit-wopi-temp.
Change-Id: I3284637d411450a35680f6499e9d29c6f94aa723
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 491341e9a..db37087ca 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -128,7 +128,8 @@ public:
_isLoaded(false),
_forceSave(false),
_isUserModified(false),
-_isAutosave(false)
+_isAutosave(false),
+_isExitSave(false)
{
LOG_DBG("Storage ctor: " << LOOLWSD::anonymizeUrl(uri.toString()));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/Storage.hpp
wsd/Storage.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e33cdb9c17db5b65de845bb9ac0f156e665e07c
Author: Andras Timar
AuthorDate: Sat Dec 15 15:57:57 2018 +0100
Commit: Andras Timar
CommitDate: Sat Dec 15 15:57:57 2018 +0100
fixup of 892117eb37b8
Change-Id: I071cb197ebdc9b39026a0ef100720809779bfb2b
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 467deea40..3591ac8b1 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -393,7 +393,7 @@ public:
bool getEnableShare() const { return _enableShare; }
-std::string& getHideUserList() const { return _hideUserList; }
+std::string& getHideUserList() { return _hideUserList; }
TriState getDisableChangeTrackingShow() const { return
_disableChangeTrackingShow; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/Storage.hpp
wsd/Storage.hpp |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 26db5646edc3f9b0fcba4e2bb624561fd49ba926
Author: Jan Holesovsky
AuthorDate: Fri Dec 7 13:39:10 2018 +0100
Commit: Jan Holesovsky
CommitDate: Fri Dec 7 13:39:10 2018 +0100
Some compilers do not like this and complain about shadowing the methods.
Change-Id: Iabdc790a9c2c37eccbcb4245a48d564c69ea5d19
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 6d56c64b0..77a2f675b 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -159,7 +159,7 @@ public:
_jailedFilePathAnonym = newPath;
}
-void setLoaded(bool isLoaded) { _isLoaded = isLoaded; }
+void setLoaded(bool loaded) { _isLoaded = loaded; }
bool isLoaded() const { return _isLoaded; }
@@ -170,14 +170,14 @@ public:
bool getForceSave() const { return _forceSave; }
/// To be able to set the WOPI extension header appropriately.
-void setUserModified(bool isUserModified) { _isUserModified =
isUserModified; }
+void setUserModified(bool userModified) { _isUserModified = userModified; }
bool isUserModified() const { return _isUserModified; }
/// To be able to set the WOPI 'is autosave/is exitsave?' headers
appropriately.
void setIsAutosave(bool isAutosave) { _isAutosave = isAutosave; }
bool getIsAutosave() const { return _isAutosave; }
-void setIsExitSave(bool isExitSave) { _isExitSave = isExitSave; }
+void setIsExitSave(bool exitSave) { _isExitSave = exitSave; }
bool isExitSave() const { return _isExitSave; }
void setFileInfo(const FileInfo& fileInfo) { _fileInfo = fileInfo; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/Storage.hpp
wsd/Storage.hpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit dc57cf8d3c7b0e97175c31411f4564b6b5f05e1a
Author: Ashod Nakashian
Date: Sun Jan 15 23:06:27 2017 -0500
wsd: 0-byte files are valid and LO loads them as new docs
Change-Id: Icf0cdd05ca7397f29bf66139d4ef15ef86ec05fd
Reviewed-on: https://gerrit.libreoffice.org/33141
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 4aada27..69b1ea9 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -43,7 +43,8 @@ public:
bool isValid() const
{
-return !_filename.empty() && _size > 0;
+// 0-byte files are valid; LO will open them as new docs.
+return !_filename.empty();
}
std::string _filename;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
