Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
48c3eb3c
Kaydet (Commit)
48c3eb3c
authored
Ara 10, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
detect infinite recurse in object creation
Change-Id: Ie56eb27bb1827860b2600a5586e866e39cd31518
üst
0bfa6ddc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lwpobjfactory.cxx
lotuswordpro/source/filter/lwpobjfactory.cxx
+5
-0
lwpobjfactory.hxx
lotuswordpro/source/filter/lwpobjfactory.hxx
+2
-1
No files found.
lotuswordpro/source/filter/lwpobjfactory.cxx
Dosyayı görüntüle @
48c3eb3c
...
@@ -701,7 +701,12 @@ rtl::Reference<LwpObject> LwpObjectFactory::QueryObject(const LwpObjectID &objID
...
@@ -701,7 +701,12 @@ rtl::Reference<LwpObject> LwpObjectFactory::QueryObject(const LwpObjectID &objID
return
nullptr
;
return
nullptr
;
}
}
if
(
std
::
find
(
m_aObjsIDInCreation
.
begin
(),
m_aObjsIDInCreation
.
end
(),
objID
)
!=
m_aObjsIDInCreation
.
end
())
throw
std
::
runtime_error
(
"recursion in object creation"
);
m_aObjsIDInCreation
.
push_back
(
objID
);
obj
=
CreateObject
(
objHdr
.
GetTag
(),
objHdr
);
obj
=
CreateObject
(
objHdr
.
GetTag
(),
objHdr
);
m_aObjsIDInCreation
.
pop_back
();
}
}
return
obj
;
return
obj
;
}
}
...
...
lotuswordpro/source/filter/lwpobjfactory.hxx
Dosyayı görüntüle @
48c3eb3c
...
@@ -72,6 +72,7 @@
...
@@ -72,6 +72,7 @@
#include "lwpidxmgr.hxx"
#include "lwpidxmgr.hxx"
#include <unordered_map>
#include <unordered_map>
#include <vector>
/**
/**
* @brief object factory used for lwp object creation and maintenance
* @brief object factory used for lwp object creation and maintenance
...
@@ -85,9 +86,9 @@ public:
...
@@ -85,9 +86,9 @@ public:
//For object Factory and object manager
//For object Factory and object manager
private
:
private
:
// static LwpObjectFactory *m_pMgr;
sal_uInt32
m_nNumObjs
;
sal_uInt32
m_nNumObjs
;
LwpSvStream
*
m_pSvStream
;
LwpSvStream
*
m_pSvStream
;
std
::
vector
<
LwpObjectID
>
m_aObjsIDInCreation
;
struct
hashFunc
struct
hashFunc
{
{
size_t
operator
()(
const
LwpObjectID
&
rName
)
const
size_t
operator
()(
const
LwpObjectID
&
rName
)
const
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment