diff options
| author | Kai Engert <kaie@kuix.de> | 2013-11-11 12:16:19 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-11-11 12:16:19 +0100 |
| commit | 45e121b5a1bc602803c17a880911083e8e6c38f1 (patch) | |
| tree | 3d981c8f6333fbc3be30bdfd4ba4c826a149bf53 /cmd/modutil | |
| parent | 7db0a59b02c5274d699ce173aa68a6d7ae9303f4 (diff) | |
| download | nss-hg-45e121b5a1bc602803c17a880911083e8e6c38f1.tar.gz | |
Bug 852972, Meaningless comparison with string literal in install-ds.c, patch by Maxim Philippov and me, r=emaldona
Diffstat (limited to 'cmd/modutil')
| -rw-r--r-- | cmd/modutil/install-ds.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/modutil/install-ds.c b/cmd/modutil/install-ds.c index f4137fc4a..9d3777a57 100644 --- a/cmd/modutil/install-ds.c +++ b/cmd/modutil/install-ds.c @@ -214,13 +214,14 @@ Pk11Install_File_Generate(Pk11Install_File* _this, FILE_PERMISSIONS_STRING)) { subiter = Pk11Install_ListIter_new(subpair->list); subval = subiter->current; - if(!subval || (subval->type != STRING_VALUE)){ + if(!subval || (subval->type != STRING_VALUE) || + !subval->string || !subval->string[0]){ errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS], _this->jarPath); goto loser; } _this->permissions = (int) strtol(subval->string, &endp, 8); - if(*endp != '\0' || subval->string == "\0") { + if(*endp != '\0') { errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS], _this->jarPath); goto loser; |