diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-11 11:39:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 11:39:06 -0800 |
| commit | 544096247a907bc55688e5c03d5586ba5219d82a (patch) | |
| tree | e5a79fd39e116b521df89d20d09f1e472153ce85 | |
| parent | e3a067f8bc98134941ee1a4da8c2a92a15aaa9cc (diff) | |
| parent | 0049acfc8b1c33eb90afc925dacd08a487618e17 (diff) | |
| download | frameworks_av-544096247a907bc55688e5c03d5586ba5219d82a.zip frameworks_av-544096247a907bc55688e5c03d5586ba5219d82a.tar.gz frameworks_av-544096247a907bc55688e5c03d5586ba5219d82a.tar.bz2 | |
Merge "Fix bug in JetPlayer::loadFromFile"
| -rw-r--r-- | include/media/JetPlayer.h | 2 | ||||
| -rw-r--r-- | media/libmedia/JetPlayer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h index 6d53989..491a950 100644 --- a/include/media/JetPlayer.h +++ b/include/media/JetPlayer.h @@ -94,7 +94,7 @@ private: S_JET_STATUS mJetStatus; S_JET_STATUS mPreviousJetStatus; - char mJetFilePath[256]; + char mJetFilePath[PATH_MAX]; class JetPlayerThread : public Thread { public: diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 188e582..38f05f2 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -338,8 +338,8 @@ int JetPlayer::loadFromFile(const char* path) Mutex::Autolock lock(mMutex); mEasJetFileLoc = (EAS_FILE_LOCATOR) malloc(sizeof(EAS_FILE)); - memset(mJetFilePath, 0, 256); - strncpy(mJetFilePath, path, strlen(path)); + strncpy(mJetFilePath, path, sizeof(mJetFilePath)); + mJetFilePath[sizeof(mJetFilePath) - 1] = '\0'; mEasJetFileLoc->path = mJetFilePath; mEasJetFileLoc->fd = 0; |