author | deller <deller> | 2005-04-05 21:10:11 (UTC) |
---|---|---|
committer | deller <deller> | 2005-04-05 21:10:11 (UTC) |
commit | f0000ae8e62df9606160ab683ae163ddc40c32c4 (patch) (unidiff) | |
tree | 642a8b7927c7ff77d196399d4498559e585a2487 /libopie2 | |
parent | e9f44f94ac905e49ea5def24532ac2d3bf4ed053 (diff) | |
download | opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.zip opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.gz opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.bz2 |
crash-fix in odevice.cpp while scanning the distribution table (#1565)
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index af77ed1..fcdbf45 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -182,25 +182,25 @@ ODevice::ODevice() | |||
182 | 182 | ||
183 | 183 | ||
184 | /* mixer */ | 184 | /* mixer */ |
185 | d->m_sound = d->m_vol = d->m_mixer = -1; | 185 | d->m_sound = d->m_vol = d->m_mixer = -1; |
186 | 186 | ||
187 | /* System QCopChannel created */ | 187 | /* System QCopChannel created */ |
188 | d->m_initializedButtonQcop = false; | 188 | d->m_initializedButtonQcop = false; |
189 | 189 | ||
190 | // New distribution detection code first checks for legacy distributions, | 190 | // New distribution detection code first checks for legacy distributions, |
191 | // identified by /etc/familiar-version or /etc/oz_version. | 191 | // identified by /etc/familiar-version or /etc/oz_version. |
192 | // Then check for OpenEmbedded and lastly, read /etc/issue | 192 | // Then check for OpenEmbedded and lastly, read /etc/issue |
193 | 193 | ||
194 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) | 194 | for ( unsigned int i = 0; i < sizeof(distributions)/sizeof(ODistribution); ++i ) |
195 | { | 195 | { |
196 | if ( QFile::exists( distributions[i].sysvfile ) ) | 196 | if ( QFile::exists( distributions[i].sysvfile ) ) |
197 | { | 197 | { |
198 | d->m_systemstr = distributions[i].sysstr; | 198 | d->m_systemstr = distributions[i].sysstr; |
199 | d->m_system = distributions[i].system; | 199 | d->m_system = distributions[i].system; |
200 | d->m_sysverstr = "<Unknown>"; | 200 | d->m_sysverstr = "<Unknown>"; |
201 | QFile f( distributions[i].sysvfile ); | 201 | QFile f( distributions[i].sysvfile ); |
202 | if ( f.open( IO_ReadOnly ) ) | 202 | if ( f.open( IO_ReadOnly ) ) |
203 | { | 203 | { |
204 | QTextStream ts( &f ); | 204 | QTextStream ts( &f ); |
205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); | 205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); |
206 | } | 206 | } |