Kaydet (Commit) d820977d authored tarafından Caolán McNamara's avatar Caolán McNamara

valgrind: fix leak

üst b48e2d95
...@@ -70,15 +70,9 @@ HWPFile::HWPFile() ...@@ -70,15 +70,9 @@ HWPFile::HWPFile()
SetCurrentDoc(this); SetCurrentDoc(this);
} }
/**
* TODO : 추가된 스타일리스트에 대한 메모리 해제
*/
HWPFile::~HWPFile() HWPFile::~HWPFile()
{ {
if (oledata)
delete oledata; delete oledata;
if (hiodev)
delete hiodev; delete hiodev;
LinkedListIterator < ColumnInfo > it_column(&columnlist); LinkedListIterator < ColumnInfo > it_column(&columnlist);
...@@ -129,20 +123,17 @@ int detect_hwp_version(const char *str) ...@@ -129,20 +123,17 @@ int detect_hwp_version(const char *str)
int HWPFile::Open(HStream & stream) int HWPFile::Open(HStream & stream)
{ {
HStreamIODev *hstreamio; HStreamIODev *hstreamio = new HStreamIODev(stream);
if (0 == (hstreamio = new HStreamIODev(stream)))
{
printf(" hstreamio is not instanciate \n");
return SetState(errno);
}
if (!hstreamio->open()) if (!hstreamio->open())
{ {
delete hstreamio; delete hstreamio;
return SetState(HWP_EMPTY_FILE); return SetState(HWP_EMPTY_FILE);
} }
SetIODevice(hstreamio);
HIODev *pPrev = SetIODevice(hstreamio);
delete pPrev;
char idstr[HWPIDLen]; char idstr[HWPIDLen];
...@@ -227,6 +218,7 @@ HIODev *HWPFile::SetIODevice(HIODev * new_hiodev) ...@@ -227,6 +218,7 @@ HIODev *HWPFile::SetIODevice(HIODev * new_hiodev)
HIODev *old_hiodev = hiodev; HIODev *old_hiodev = hiodev;
hiodev = new_hiodev; hiodev = new_hiodev;
return old_hiodev; return old_hiodev;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment