CDPP / AMDA_IHM

Commit 777c3ca98fd2082d379e2d718a9ece4701c97350

Authored by Benjamin Renard
1 parent 6ec889c4
Exists in master and in 72 other branches 10098, 10178, 5390, 6629, 7616, 8459, 8528, 9014, 9016Bis, 9084, 9326, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

Fix buffer init in ncinfo_remote

Showing 1 changed file with 10 additions and 5 deletions   Show diff stats
Inline Side-by-side
php/src/ncinfo_remote.c
  Diff comments   View file @777c3ca
... ... @@ -50,16 +50,17 @@ main(int argc, char **argv)
50 50 printf("Incorrect number of arguments\n");
51 51 exit(1);
52 52 }
53   -
  53 +
54 54 infoId = atoi(argv[3]);
55 55  
56   - stat = nc_open(argv[1],NC_WRITE|NC_SHARE,&ncID); check(stat);
  56 + stat = nc_open(argv[1],0,&ncID); check(stat);
57 57  
58 58 stat = nc_inq_varid(ncID, argv[2], &varID); check(stat);
  59 +
59 60 stat = nc_inq_varndims(ncID, varID, &ndims); check(stat);
60   -
  61 +
61 62 stat = nc_inq_vardimid(ncID, varID, dimids); check(stat);
62   -
  63 +
63 64 size_t len = 0;
64 65 // size
65 66 if (ndims > 1)
... ... @@ -85,7 +86,8 @@ main(int argc, char **argv)
85 86 fprintf(stdout, "-1");
86 87 exit(0);
87 88 }
88   - unsigned char *string_attr = (unsigned char *)malloc(attlen * sizeof(char*));
  89 + unsigned char *string_attr = (unsigned char *)malloc(attlen * sizeof(char*));
  90 + memset(string_attr, 0, attlen * sizeof(char*));
89 91 stat = nc_get_att(ncID, varID, "LABL_PTR_1", string_attr);
90 92 if (stat != NC_NOERR) {
91 93 fprintf(stdout, "-1");
... ... @@ -116,6 +118,7 @@ main(int argc, char **argv)
116 118 unsigned char *string_var = (unsigned char *)malloc(length * sizeof(char*));
117 119 for (i = 0; i < size; i++)
118 120 {
  121 + memset(string_var, 0, length * sizeof(char*));
119 122 stat = nc_get_vara(ncID, labelID, start, count, string_var); check(stat);
120 123 fprintf(stdout, "%s", string_var);
121 124 if (i < size -1) fprintf(stdout,",");
... ... @@ -131,6 +134,7 @@ main(int argc, char **argv)
131 134 stat = nc_inq_attlen(ncID, varID, info[infoId-2], &attlen); check(stat);
132 135  
133 136 unsigned char *string_attr = (unsigned char *)malloc(attlen * sizeof(char*));
  137 + memset(string_attr, 0, attlen * sizeof(char*));
134 138 stat = nc_get_att(ncID, varID, info[infoId-2], string_attr); check(stat);
135 139 fprintf(stdout, "%s", string_attr);
136 140 free(string_attr);
... ... @@ -169,6 +173,7 @@ main(int argc, char **argv)
169 173 }
170 174 else {
171 175 unsigned char *string_attr = (unsigned char *)malloc(attlen * sizeof(char*));
  176 + memset(string_attr, 0, attlen * sizeof(char*));
172 177 stat = nc_get_att(ncID, varID, info[infoId-1], string_attr);
173 178 if (strcasecmp(string_attr,"spectrogram") != 0)
174 179 fprintf(stdout, "0");
... ...