generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug in the function of search of Android applicvation path.

Browse Source
This commit is contained in:
Leonid Beynenson 2011-07-14 18:41:09 +00:00
parent b16fb5d518
commit c8a603d853
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/androidcamera/src/camera_activity.cpp
View File

@ -264,6 +264,10 @@ std::string CameraWrapperConnector::getPathLibFolder()
sprintf(addrBuf, "%p-", dl_info.dli_fbase); sprintf(addrBuf, "%p-", dl_info.dli_fbase);
int addrLength = strlen(addrBuf); int addrLength = strlen(addrBuf);
const char* libName=dl_info.dli_fname;
while( ((*libName)=='/') || ((*libName)=='.') )
libName++;
char lineBuf[2048]; char lineBuf[2048];
FILE* file = fopen("/proc/self/smaps", "rt"); FILE* file = fopen("/proc/self/smaps", "rt");
@ -271,11 +275,9 @@ std::string CameraWrapperConnector::getPathLibFolder()
{ {
while (fgets(lineBuf, sizeof lineBuf, file) != NULL) while (fgets(lineBuf, sizeof lineBuf, file) != NULL)
{ {
if(0 == strncmp(lineBuf, addrBuf, addrLength))
{
//verify that line ends with library name //verify that line ends with library name
int lineLength = strlen(lineBuf); int lineLength = strlen(lineBuf);
int libNameLength = strlen(dl_info.dli_fname); int libNameLength = strlen(libName);
//trim end //trim end
for(int i = lineLength - 1; i >= 0 && isspace(lineBuf[i]); --i) for(int i = lineLength - 1; i >= 0 && isspace(lineBuf[i]); --i)
@ -284,9 +286,9 @@ std::string CameraWrapperConnector::getPathLibFolder()
--lineLength; --lineLength;
} }
if (0 != strncmp(lineBuf + lineLength - libNameLength, dl_info.dli_fname, libNameLength)) if (0 != strncmp(lineBuf + lineLength - libNameLength, libName, libNameLength))
{ {
LOGE("Strange error: line \"%s\" does not ends with library name %s", lineBuf, dl_info.dli_fname); //the line does not contain the library name
continue; continue;
} }
@ -305,7 +307,6 @@ std::string CameraWrapperConnector::getPathLibFolder()
fclose(file); fclose(file);
return pathBegin; return pathBegin;
}
} }
fclose(file); fclose(file);
LOGE("Could not find library path."); LOGE("Could not find library path.");