summaryrefslogtreecommitdiffstats
path: root/xpcom
diff options
context:
space:
mode:
Diffstat (limited to 'xpcom')
-rw-r--r--xpcom/base/nsSystemInfo.cpp9
-rw-r--r--xpcom/io/SlicedInputStream.cpp2
2 files changed, 10 insertions, 1 deletions
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index 9febabaad7..9a389f6938 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -57,6 +57,7 @@
# include <unistd.h>
# include <fstream>
# include "mozilla/Tokenizer.h"
+# include "mozilla/widget/LSBUtils.h"
# include "nsCharSeparatedTokenizer.h"
# include <map>
@@ -1139,6 +1140,14 @@ nsresult nsSystemInfo::Init() {
SetupAndroidInfo(info);
#endif
+#if defined(XP_LINUX) && !defined(ANDROID)
+ nsCString dist, desc, release, codename;
+ if (widget::lsb::GetLSBRelease(dist, desc, release, codename)) {
+ SetPropertyAsACString(u"distro"_ns, dist);
+ SetPropertyAsACString(u"distroVersion"_ns, release);
+ }
+#endif
+
#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
SandboxInfo sandInfo = SandboxInfo::Get();
diff --git a/xpcom/io/SlicedInputStream.cpp b/xpcom/io/SlicedInputStream.cpp
index 0b45f67b0e..c64af8e9dd 100644
--- a/xpcom/io/SlicedInputStream.cpp
+++ b/xpcom/io/SlicedInputStream.cpp
@@ -464,7 +464,7 @@ void SlicedInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams,
uint32_t sizeUsed = 0, pipes = 0, transferables = 0;
SerializedComplexity(aMaxSize, &sizeUsed, &pipes, &transferables);
if (pipes > 0 && transferables == 0) {
- InputStreamHelper::SerializeInputStreamAsPipe(mInputStream, aParams);
+ InputStreamHelper::SerializeInputStreamAsPipe(this, aParams);
return;
}