Fix FTBFS on Linux specific memlock code

pull/2/head
François Andriot 10 years ago committed by Slávek Banko
parent a28cbf4837
commit e175139565

@ -1075,9 +1075,11 @@ QStringData::~QStringData() {
if ( unicode ) {
delete[] ((char*)unicode);
}
#if defined(Q_OS_LINUX)
if ( ascii && security_unpaged ) {
munlock(ascii, LINUX_MEMLOCK_LIMIT_BYTES);
}
#endif
if ( ascii ) {
delete[] ascii;
}
@ -5953,15 +5955,19 @@ const char* QString::ascii() const
void QString::setSecurityUnPaged(bool lock) {
if (lock != d->security_unpaged) {
if (d->security_unpaged) {
#if defined(Q_OS_LINUX)
if (d->ascii) {
munlock(d->ascii, LINUX_MEMLOCK_LIMIT_BYTES);
}
#endif
d->security_unpaged = false;
}
else {
#if defined(Q_OS_LINUX)
if (d->ascii) {
mlock(d->ascii, LINUX_MEMLOCK_LIMIT_BYTES);
}
#endif
d->security_unpaged = true;
}
}

@ -461,7 +461,9 @@ QLineEdit::~QLineEdit()
{
if ((d->echoMode == NoEcho) || (d->echoMode == Password) || (d->echoMode == PasswordThreeStars)) {
d->text.fill(QChar(0));
#if defined(Q_OS_LINUX)
munlock(d->text.d->unicode, LINUX_MEMLOCK_LIMIT_BYTES);
#endif
}
delete [] d->maskData;
delete d;

Loading…
Cancel
Save