← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nss/quantal-updates

« back to all changes in this revision

Viewing changes to nss/cmd/modutil/install-ds.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-01-22 15:16:14 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140122151614-yrna9tfai5hbd1ku
Tags: 3.15.4-0ubuntu0.12.10.1
* SECURITY UPDATE: MITM attack via TLS False Start
  - CVE-2013-1740
* Adjusted packaging for new upstream release 3.15.4:
  - debian/patches/*: refreshed.
  - debian/libnss3.symbols: added new symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nss/cmd/modutil/install-ds.c
214
214
                                     FILE_PERMISSIONS_STRING)) {
215
215
                                subiter = Pk11Install_ListIter_new(subpair->list);
216
216
                                subval = subiter->current;
217
 
                                if(!subval || (subval->type != STRING_VALUE)){
 
217
                                if(!subval || (subval->type != STRING_VALUE) ||
 
218
                                   !subval->string || !subval->string[0]){
218
219
                                        errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
219
220
                                    _this->jarPath);
220
221
                                        goto loser;
221
222
                                }
222
223
                                _this->permissions = (int) strtol(subval->string, &endp, 8);
223
 
                                if(*endp != '\0' || subval->string == "\0") {
 
224
                                if(*endp != '\0') {
224
225
                                        errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
225
226
                                    _this->jarPath);
226
227
                                        goto loser;